From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 4 Sep 2014 02:02:46 +0000 (-0700)
Subject: * configure.ac (MAKEINFO): Clean up some configuration bitrot.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~357
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=315d21d20f219234253e11877a382a61fb936cb9;p=emacs.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index 8a7920f57cd..bbf651057f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* 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  <eggert@cs.ucla.edu>
 
 	Merge from gnulib, incorporating:
diff --git a/configure.ac b/configure.ac
index 912fac178e4..cccd73ee420 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1087,15 +1087,16 @@ if test $opsys = gnu-linux; then
 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