PR binutils/1860

	* configure.in: Require makeinfo 4.4 or higher.
	* configure: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index c0126cd14da35f329b23d40211198866298aa2a2..5b9d02e456678731511c1baa7138f15a84acd278 100644 (file)
--- 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 2dae3f1c722232ca2ee33c72004815aba5ccebdb..b8d5b81fc9f5553ea1941217af9fd9efb5b3505b 100755 (executable)
--- 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 da7c63f4f5bcb4b62924787ab27d015b044764b3..def58c466cb051a6e3a51afc725b27deae3b520b 100644 (file)
--- 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"