[Emacs-diffs] trunk r117814: * configure.ac (MAKEINFO): Clean up some configuration bitrot.

[Paul Eggert]

------------------------------------------------------------
revno: 117814
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-03 19:02:46 -0700
message:
  * configure.ac (MAKEINFO): Clean up some configuration bitrot.
  
  MAKEINFO is already set before we get here, so no need to call AC_PATH_PROG.
  Bypass $am_missing_run.  Simplify version-number checking.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-09-02 19:17:23 +0000
+++ b/ChangeLog 2014-09-04 02:02:46 +0000
@@ -1,3 +1,9 @@
+2014-09-04  Paul Eggert  <address@hidden>
+
+       * configure.ac (MAKEINFO): Clean up some configuration bitrot.
+       MAKEINFO is already set before we get here, so no need to call 
AC_PATH_PROG.
+       Bypass $am_missing_run.  Simplify version-number checking.
+
 2014-09-02  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2014-09-01 02:37:22 +0000
+++ b/configure.ac      2014-09-04 02:02:46 +0000
@@ -1087,15 +1087,16 @@
 fi
 
 ## 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"; then
-  case `
-    $MAKEINFO --version 2> /dev/null |
-    $EGREP 
'texinfo[[^0-9]]*([[1-4]][[0-9]]+|[[5-9]]|4\.[[7-9]]|4\.[[1-6]][[0-9]]+)'
-  ` in
-    '') MAKEINFO=no;;
+  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
 fi