[PATCH] makeinfo version check

Jakub Jelinek jakub@redhat.com
Sat Sep 22 16:59:00 GMT 2007


On Fri, Sep 14, 2007 at 04:57:18PM +0000, Joseph S. Myers wrote:
> GCC has its own makeinfo version check in gcc/configure.ac that may need 
> updating as well, as well as the toplevel one.

Yeah, just ran into this as well.

Ok for 4.3/4.2/4.1?  Mark, ok even before 4.2.2 release?

	Jakub
-------------- next part --------------
2007-09-22  Jakub Jelinek  <jakub@redhat.com>

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

--- gcc/configure.ac.jj	2007-09-22 14:51:44.000000000 +0200
+++ gcc/configure.ac	2007-09-22 14:53:01.000000000 +0200
@@ -841,7 +841,7 @@ AC_CHECK_PROG(have_mktemp_command, mktem
 # 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]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   AC_MSG_WARN([
 *** Makeinfo is missing or too old.
--- gcc/configure.jj	2007-09-22 14:51:51.000000000 +0200
+++ gcc/configure	2007-09-22 14:53:23.000000000 +0200
@@ -7719,7 +7719,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
 
-------------- next part --------------
2007-09-22  Jakub Jelinek  <jakub@redhat.com>

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

--- gcc/configure.ac.jj	2007-09-22 14:52:25.000000000 +0200
+++ gcc/configure.ac	2007-09-22 14:53:42.000000000 +0200
@@ -877,7 +877,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir
 # 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-9][0-9]*|[5-9]*|[1-9][0-9]*])
 if test $gcc_cv_prog_makeinfo_modern = no; then
   MAKEINFO="$MISSING makeinfo"
   AC_MSG_WARN([
--- gcc/configure.jj	2007-09-22 14:52:17.000000000 +0200
+++ gcc/configure	2007-09-22 14:53:59.000000000 +0200
@@ -7654,7 +7654,7 @@ else
   echo "configure:7654: 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-9][0-9]*|[5-9]*|[1-9][0-9]*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac
-------------- next part --------------
2007-09-22  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.

--- configure.in.jj	2007-02-20 16:41:55.000000000 -0500
+++ configure.in	2007-09-22 09:36:04.000000000 -0400
@@ -2159,7 +2159,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"
--- configure.jj	2007-02-20 16:41:55.000000000 -0500
+++ configure	2007-09-22 09:36:25.000000000 -0400
@@ -3574,7 +3574,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"
--- gcc/configure.ac.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure.ac	2007-09-22 08:38:07.000000000 -0400
@@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir
 # 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([
--- gcc/configure.jj	2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure	2007-09-22 08:38:30.000000000 -0400
@@ -7496,7 +7496,7 @@ else
   echo "configure:7496: 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


More information about the Gcc-patches mailing list