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

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

From-SVN: r128693

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 198e24eb814225bc3ccf10a43c9966918c53ce41..0227acd0a751094c9da197f93cc628faa370b6b5 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-23  Jan Hubicka  <jh@suse.cz>
 
        * params.def (INLINE_CALL_COST): Set to 12.

diff --git a/gcc/configure b/gcc/configure
index a1928534aaee26de4b8540c04b1cf8f802127008..abb1e203709c14f2d1a613f198ce30405e4b2024 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -7719,7 +7719,7 @@ else
 
                     case $ac_prog_version in
                       '')  gcc_cv_prog_makeinfo_modern=no;;
-                      4.[4-9]*)  gcc_cv_prog_makeinfo_modern=yes;;
+                      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 9627d36e363e38f2f4f949a949f5944b7154a665..ad957ebaa747f49c136eb7f54ebac2fc113ae2d8 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -841,7 +841,7 @@ AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
 # that we can use it.
 ACX_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
   AC_MSG_WARN([
 *** Makeinfo is missing or too old.