[llvm-commits] [llvm-gcc-4.2] r74318 - in /llvm-gcc-4.2/trunk/gcc: configure configure.ac

[Bob Wilson]

Author: bwilson
Date: Fri Jun 26 15:28:52 2009
New Revision: 74318

URL: http://llvm.org/viewvc/llvm-project?rev=74318&view=rev
Log:
Fix pr4392. Recognize more recent versions of makeinfo.

Modified:
    llvm-gcc-4.2/trunk/gcc/configure
    llvm-gcc-4.2/trunk/gcc/configure.ac

Modified: llvm-gcc-4.2/trunk/gcc/configure
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure?rev=74318&r1=74317&r2=74318&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure (original)
+++ llvm-gcc-4.2/trunk/gcc/configure Fri Jun 26 15:28:52 2009
@@ -8022,7 +8022,7 @@
   echo "configure:8022: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    4.[4-9]*)
+    4.[4-9]* | 4.1[0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac

Modified: llvm-gcc-4.2/trunk/gcc/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/configure.ac?rev=74318&r1=74317&r2=74318&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/configure.ac (original)
+++ llvm-gcc-4.2/trunk/gcc/configure.ac Fri Jun 26 15:28:52 2009
@@ -965,7 +965,7 @@
 # that we can use it.
 gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
   [GNU texinfo.* \([0-9][0-9.]*\)],
-  [4.[4-9]*])
+  [4.[4-9]* | 4.1[0-9]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   MAKEINFO="$MISSING makeinfo"
   AC_MSG_WARN([