[multiple changes]

2007-09-23  Jakub Jelinek  <jakub@redhat.com>

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

2007-09-15  Alan Modra  <amodra@bigpond.net.au>

	* configure.in: Correct makeinfo version check.
	* configure: Regenerate.

From-SVN: r128695

diff --git a/ChangeLog b/ChangeLog
index 4ce752656094480330fd02787e36ca6faed6c832..25ed362c431eea550f8ce49ff8e25c741f0ccc3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-15  Alan Modra  <amodra@bigpond.net.au>
+
+       * configure.in: Correct makeinfo version check.
+       * configure: Regenerate.
+
 2007-07-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
        * MAINTAINERS (OS Port Maintainers): Add myself as IRIX, Tru64 UNIX

diff --git a/configure b/configure
index 1afdeb4f237bd4edaf90fe2db49022285ace323c..72eb1118cf22b3e9b260a03098316f90a2b71b9e 100755 (executable)
--- a/configure
+++ b/configure
@@ -3549,7 +3549,7 @@ case " $build_configdirs " in
     # For an installed makeinfo, we require it to be from texinfo 4.2 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"

diff --git a/configure.in b/configure.in
index 7e77b86162aa77c6e6a2adc3ff8231232b044285..6179fb7f5507f1dd0369bb696ad27c8d074f73d7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2134,7 +2134,7 @@ changequote(,)
     # For an installed makeinfo, we require it to be from texinfo 4.2 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([2-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65010fc49f7fb88c3ee4f1eb5152a1b65d515fc3..f960ab139707bd47efd2745d64dede0a6032ebd0 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 5dce3f19f84940458da485a43af849478d2fafcf..dfe079ccdae0231900aae48fa9412d72a59df8be 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -7495,7 +7495,7 @@ else
   echo "configure:7495: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    4.[2-9]*)
+    4.[2-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 e6bdbf0bc2a17d352a394fd53bdeb6da898f3ca4..5f78097343578430e007941c6b5c62641e1bcaa4 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -833,7 +833,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.[2-9]*])
+  [4.[2-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([