From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?iso-8859-1?Q?Vincent_Bela=EFche?= Newsgroups: gmane.emacs.devel Subject: Patch to allow texi2any for EMACS manual compilation Date: Sun, 21 Sep 2014 22:48:40 +0200 Message-ID: <80oau8g0nr.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1411333011 4700 80.91.229.3 (21 Sep 2014 20:56:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 21 Sep 2014 20:56:51 +0000 (UTC) To: EMACS devel list , Karl Berry , pertusus@free.fr Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 21 22:56:44 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XVoBX-000290-2V for ged-emacs-devel@m.gmane.org; Sun, 21 Sep 2014 22:56:43 +0200 Original-Received: from localhost ([::1]:40930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XVoBW-00014f-K2 for ged-emacs-devel@m.gmane.org; Sun, 21 Sep 2014 16:56:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XVoBO-000141-Cw for emacs-devel@gnu.org; Sun, 21 Sep 2014 16:56:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XVoBI-0005Ny-Bi for emacs-devel@gnu.org; Sun, 21 Sep 2014 16:56:34 -0400 Original-Received: from smtp03.smtpout.orange.fr ([80.12.242.125]:59999 helo=smtp.smtpout.orange.fr) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XVoBI-0005Mo-5E for emacs-devel@gnu.org; Sun, 21 Sep 2014 16:56:28 -0400 Original-Received: from CHOUNEK ([90.32.172.128]) by mwinf5d06 with ME id twoq1o0082maGi203woqlA; Sun, 21 Sep 2014 22:48:51 +0200 X-ME-Helo: CHOUNEK X-ME-Date: Sun, 21 Sep 2014 22:48:51 +0200 X-ME-IP: 90.32.172.128 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.12.242.125 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:174623 Archived-At: --=-=-= Content-Type: text/plain Hello, I propose the following patch (attached) so that one can have the makeinfo program somehow made pointing at texi2any. motivation: - makeinfo (C based) is no longer maintained, so sooner or later we will have to allow manual compilation with texi2any - texi2any command line is a superset of makeinfo, so there may be installations where calling makeinfo actually calls texi2any (or any other tricks like setting MAKEINFO to texi2any before calling configure --- e.g., at least on my machine, makeinfo.exe is some wrapper that calls texi2any under the hood. - I think that texi2any versioning commences at 5.0 --- maybe Karl or Patrice can confirm, so I think that the test on version number in the attached patch would be valid. If people agree I can do the change. VBR, Vincent. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=configure_ac.diff === modified file 'configure.ac' --- configure.ac 2014-09-15 00:20:21 +0000 +++ configure.ac 2014-09-21 20:40:19 +0000 @@ -1102,13 +1102,20 @@ if test "$MAKEINFO" = "${am_missing_run}makeinfo"; then MAKEINFO=makeinfo fi - case `($MAKEINFO --version) 2>/dev/null` in - 'makeinfo (GNU texinfo) '4.[[7-9]]* | \ - 'makeinfo (GNU texinfo) '4.[[1-9][0-9]]* | \ - 'makeinfo (GNU texinfo) '[[5-9]]* | \ - 'makeinfo (GNU texinfo) '[[1-9][0-9]]* ) ;; - *) MAKEINFO=no;; - esac + MAKEINFO_VERSION=`($MAKEINFO --version) 2>/dev/null`; + declare -i MAKEINFO_CHECK=0; + for MAKEINFO_IMPLEMENTATION in makeinfo texi2any; do + case $MAKEINFO_VERSION in + "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "4.[7-9]* | \ + "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "4.[1-9][0-9]* | \ + "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "[5-9]* | \ + "$MAKEINFO_IMPLEMENTATION (GNU texinfo) "[1-9][0-9]* ) + MAKEINFO_CHECK=$MAKEINFO_CHECK+1;; + esac + done + if [ $MAKEINFO_CHECK -eq 0 ]; then + MAKEINFO=no; + fi fi ## Makeinfo is unusual. For a released Emacs, the manuals are --=-=-=--