This commit is contained in:
Jakub Jelinek 2007-09-22 13:25:53 +00:00
parent 14e9c95c97
commit 3b9adfc334

View File

@ -1,8 +1,33 @@
2007-09-22 Jakub Jelinek <jakub@redhat.com> 2007-09-22 Jakub Jelinek <jakub@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.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
* configure: Regenerated. * configure: Regenerated.
--- configure.in.jj 2007-02-20 16:41:55.000000000 -0500
+++ configure.in 2007-09-22 09:23:30.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
:
else
MAKEINFO="$MISSING makeinfo"
--- configure.jj 2007-02-20 16:41:55.000000000 -0500
+++ configure 2007-09-22 09:24:08.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
:
else
MAKEINFO="$MISSING makeinfo"
--- gcc/configure.ac.jj 2007-02-20 16:39:12.000000000 -0500 --- gcc/configure.ac.jj 2007-02-20 16:39:12.000000000 -0500
+++ gcc/configure.ac 2007-09-22 08:38:07.000000000 -0400 +++ gcc/configure.ac 2007-09-22 08:38:07.000000000 -0400
@@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir @@ -833,7 +833,7 @@ MISSING="${CONFIG_SHELL-/bin/sh} $srcdir