2007-09-22 12:45:46 +00:00
|
|
|
2007-09-22 Jakub Jelinek <jakub@redhat.com>
|
|
|
|
|
|
2007-09-22 13:25:53 +00:00
|
|
|
* configure.in (MAKEINFO): Handle makeinfo version 4.10 through 4.99.
|
|
|
|
|
* configure: Regenerated.
|
|
|
|
|
gcc/
|
2007-09-22 12:45:46 +00:00
|
|
|
* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
|
|
|
|
|
* configure: Regenerated.
|
|
|
|
|
|
2007-09-22 13:25:53 +00:00
|
|
|
--- 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"
|
2007-09-22 12:45:46 +00:00
|
|
|
--- 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]*])
|
|
|
|
|
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]*)
|
|
|
|
|
gcc_cv_prog_makeinfo_modern=yes;;
|
|
|
|
|
*) gcc_cv_prog_makeinfo_modern=no;;
|
|
|
|
|
esac
|
