configure.ac: Adjust makeinfo version check.

2007-11-23  Matthias Klose  <doko@ubuntu.com>

       * configure.ac: Adjust makeinfo version check.
       * configure: Regenerate.

From-SVN: r130367

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 08b417b9a5498d1b37c8c63d2426be2fbe8ff5c0..63c0b77302de806d97a0ff3d22b43842021e70ec 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-23  Matthias Klose  <doko@ubuntu.com>
+
+       * configure.ac: Adjust makeinfo version check.
+       * configure: Regenerate.
+
 2007-11-10  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/34020

diff --git a/libgomp/configure b/libgomp/configure
index 2ffa957fa2432489f49f36c2e58af1c46687409d..cb78249f4cd0dd073e51799aee5dca442e27fd11 100755 (executable)
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -3679,7 +3679,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/libgomp/configure.ac b/libgomp/configure.ac
index 427c8f7c7531fcca093632c4a0e79b3a93ad4995..68a18e175615d352026d123462d4d8481286fb66 100644 (file)
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -134,7 +134,7 @@ AC_PROG_INSTALL
 # 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]*])
 AM_CONDITIONAL(BUILD_INFO, test $gcc_cv_prog_makeinfo_modern = "yes")