From 973ba6cfa30630a9c4bdc815567d17f933a64af7 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 23 Nov 2007 09:30:22 +0000 Subject: [PATCH] configure.ac: Adjust makeinfo version check. 2007-11-23 Matthias Klose * configure.ac: Adjust makeinfo version check. * configure: Regenerate. From-SVN: r130368 --- libgomp/ChangeLog | 5 +++++ libgomp/configure | 8 ++++---- libgomp/configure.ac | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 7e6f6258dd2b..a229b1162205 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2007-11-23 Matthias Klose + + * 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 af4254c1fda0..f55048fae7e9 100755 --- 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 fc0f0030d4e6..296692c483ec 100644 --- 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") -- 2.47.2