summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2006-03-31 02:32:20 +0000
committerBen Elliston <bje@au.ibm.com>2006-03-31 02:32:20 +0000
commitaa6be8b8574d4b14f26687d6930917ac02b66d63 (patch)
treea402b32f39e6c491f99b6ebddf4eae5ebde8ff2d
parent5f7c0086e3d835484109c093dcb84f2b3f4c7d0e (diff)
downloadgdb-aa6be8b8574d4b14f26687d6930917ac02b66d63.tar.gz
PR binutils/1860
* configure.in: Require makeinfo 4.4 or higher. * configure: Regenerate.
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure4
-rw-r--r--configure.in4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c0126cd14da..5b9d02e4566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-31 Ben Elliston <bje@au.ibm.com>
+
+ PR binutils/1860
+ * configure.in: Require makeinfo 4.4 or higher.
+ * configure: Regenerate.
+
2006-03-14 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
diff --git a/configure b/configure
index 2dae3f1c722..b8d5b81fc9f 100755
--- a/configure
+++ b/configure
@@ -3628,10 +3628,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.2 or
+ # For an installed makeinfo, we require it to be from texinfo 4.4 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\.[4-9]|[5-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"
diff --git a/configure.in b/configure.in
index da7c63f4f5b..def58c466cb 100644
--- a/configure.in
+++ b/configure.in
@@ -2203,10 +2203,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.2 or
+ # For an installed makeinfo, we require it to be from texinfo 4.4 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\.[4-9]|[5-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"