rpms/gcc/devel gcc41-makeinfo-ver.patch,1.2,1.3

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16605

Modified Files:
	gcc41-makeinfo-ver.patch 
Log Message:
4.1.2-26

gcc41-makeinfo-ver.patch:

Index: gcc41-makeinfo-ver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc41-makeinfo-ver.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc41-makeinfo-ver.patch	22 Sep 2007 13:25:53 -0000	1.2
+++ gcc41-makeinfo-ver.patch	22 Sep 2007 13:39:39 -0000	1.3
@@ -1,30 +1,32 @@
 2007-09-22  Jakub Jelinek  <jakub at redhat.com>
 
-	* configure.in (MAKEINFO): Handle makeinfo version 4.10 through 4.99.
-	* configure: Regenerated.
-gcc/
 	* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
 	* configure: Regenerated.
 
+2007-09-15  Alan Modra  <amodra at 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:23:30.000000000 -0400
++++ 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]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-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:24:08.000000000 -0400
++++ 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]*([1-3][0-9]|4\.[2-9]|4\.[1-9][0-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"