configure.ac: Adjust makeinfo version check.

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

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

From-SVN: r130368

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 7e6f6258dd2b4ccdbfa0e1f65545844b4f17f35f..a229b11622054f42a3d4fb005f558dc1f8ad0ef2 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-10-07  Release Manager
 
        * GCC 4.2.2 released.

diff --git a/libgomp/configure b/libgomp/configure
index af4254c1fda0232fde4cbe087e871b8a83ecb8c9..f55048fae7e9cd754e28f0621d9e4b9ad3f7322f 100755 (executable)
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -718,13 +718,13 @@ echo X"$0" |
          /^X\(\/\).*/{ s//\1/; q; }
          s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r "$srcdir/$ac_unique_file"; then
+if test ! -r $srcdir/$ac_unique_file; then
   if test "$ac_srcdir_defaulted" = yes; then
     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
    { (exit 1); exit 1; }; }
@@ -733,7 +733,7 @@ if test ! -r "$srcdir/$ac_unique_file"; then
    { (exit 1); exit 1; }; }
   fi
 fi
-(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
    { (exit 1); exit 1; }; }
 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
@@ -3527,7 +3527,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
                                                                                                                                                                                if test $gcc_cv_prog_makeinfo_modern = no; then

diff --git a/libgomp/configure.ac b/libgomp/configure.ac
index fc0f0030d4e6829be8661da84383fb4cb0bcbced..296692c483ec6400c0caefc269d7e4df29f11524 100644 (file)
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -135,7 +135,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")