aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2007-09-17 20:59:06 +0000
committerAndreas Schwab <schwab@linux-m68k.org>2007-09-17 20:59:06 +0000
commit625a61cdc4feb2323eefdffe01ed1c505d7c5c1c (patch)
tree77dcd2976c29df4b6b21fb4f5f08d507e5c9ec1e
parentf4c1edd8e5cf0259b98f7c64b0b88adef1d21d3c (diff)
downloadbinutils-625a61cdc4feb2323eefdffe01ed1c505d7c5c1c.zip
binutils-625a61cdc4feb2323eefdffe01ed1c505d7c5c1c.tar.gz
binutils-625a61cdc4feb2323eefdffe01ed1c505d7c5c1c.tar.bz2
* configure.ac: Raise minimum makeinfo version to 4.6.
* configure: Regenerate.
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d16be0b..4376831 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-17 Andreas Schwab <schwab@suse.de>
+
+ * configure.ac: Raise minimum makeinfo version to 4.6.
+ * configure: Regenerate.
+
2007-09-15 Alan Modra <amodra@bigpond.net.au>
* configure.ac: Correct makeinfo version check.
diff --git a/configure b/configure
index 47194cd..27edacd 100755
--- a/configure
+++ b/configure
@@ -6189,10 +6189,10 @@ case " $build_configdirs " in
*" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
*)
- # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # For an installed makeinfo, we require it to be from texinfo 4.6 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"
diff --git a/configure.ac b/configure.ac
index 1624f1e..a79abb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2459,10 +2459,10 @@ case " $build_configdirs " in
*" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
*)
changequote(,)
- # For an installed makeinfo, we require it to be from texinfo 4.4 or
+ # For an installed makeinfo, we require it to be from texinfo 4.6 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"