configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.

	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
	* configure: Regenerated.

From-SVN: r128694

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f71c901d43fdeb9440f36a4fbb9eb0df9c447aff..5ed9310a9dc4daa0c38d68b10f133a81219a766c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-23  Jakub Jelinek  <jakub@redhat.com>
+
+       * configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
+       * configure: Regenerated.
+
 2007-09-13  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR bootstrap/33418

diff --git a/gcc/configure b/gcc/configure
index 1d2698e8366f1858d23430d1015cfa3e3e7c774d..615fe1d6c4559154b64e041b2bf06f03f3d530c2 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -7654,7 +7654,7 @@ else
   echo "configure:7654: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    4.[4-9]*)
+    4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac

diff --git a/gcc/configure.ac b/gcc/configure.ac
index d45e073d1b60ab0cf9974a240dbecc73851aac35..aad57298b2e48114047813e6445a67ef7cf79776 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -877,7 +877,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir/../missing"
 # that we can use it.
 gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [4.[4-9]*])
+  [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   MAKEINFO="$MISSING makeinfo"
   AC_MSG_WARN([