emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch to allow texi2any for EMACS manual compilation


From: Vincent Belaïche
Subject: Patch to allow texi2any for EMACS manual compilation
Date: Sun, 21 Sep 2014 22:48:40 +0200

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.



=== 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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]