[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107801: * configure.in: Require makeinfo >= 4.7.

[Glenn Morris]

------------------------------------------------------------
revno: 107801
fixes bug: http://debbugs.gnu.org/10910
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-08 17:50:17 -0700
message:
  * configure.in: Require makeinfo >= 4.7. 
  Eg org.texi has been using 4.7 functions for some time.
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-04-07 20:45:36 +0000
+++ b/ChangeLog 2012-04-09 00:50:17 +0000
@@ -1,3 +1,8 @@
+2012-04-09  Glenn Morris  <address@hidden>
+
+       * configure.in: Require makeinfo >= 4.7.  (Bug#10910)
+       Eg org.texi has been using 4.7 functions for some time.
+
 2012-04-07  Paul Eggert  <address@hidden>
 
        Check pkg-config exit status when configuring (Bug#10626).

=== modified file 'configure.in'
--- a/configure.in      2012-04-07 20:45:36 +0000
+++ b/configure.in      2012-04-09 00:50:17 +0000
@@ -758,12 +758,12 @@
 AC_PATH_PROG(GZIP_PROG, gzip)
 
 
-## Need makeinfo >= 4.6 (?) to build the manuals.
+## Need makeinfo >= 4.7 (?) to build the manuals.
 AC_PATH_PROG(MAKEINFO, makeinfo, no)
 dnl By this stage, configure has already checked for egrep and set EGREP,
 dnl or exited with an error if no egrep was found.
 if test "$MAKEINFO" != "no" && \
-  test x"`$MAKEINFO --version 2> /dev/null | $EGREP 
'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[6-9]]|4\.[[1-5]][[0-9]]+)'`" = 
x; then
+  test x"`$MAKEINFO --version 2> /dev/null | $EGREP 
'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'`" = 
x; then
    MAKEINFO=no
 fi
 
@@ -783,7 +783,7 @@
   if test "x${with_makeinfo}" = "xno"; then
     HAVE_MAKEINFO=no
   elif test ! -e $srcdir/info/emacs; then
-    AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.6, and your
+    AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your
 source tree does not seem to have pre-built manuals in the `info' directory.
 Either install a suitable version of makeinfo, or re-run configure
 with the `--without-makeinfo' option to build without the manuals.] )