From 3bdcd964f90c57f4882ca874b6e82ed7f0e235b0 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Fri, 31 Mar 2006 02:32:20 +0000 Subject: [PATCH] PR binutils/1860 * configure.in: Require makeinfo 4.4 or higher. * configure: Regenerate. --- ChangeLog | 6 ++++++ configure | 4 ++-- configure.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0126cd14..5b9d02e45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-31 Ben Elliston + + PR binutils/1860 + * configure.in: Require makeinfo 4.4 or higher. + * configure: Regenerate. + 2006-03-14 Paolo Bonzini * Makefile.in: Regenerate. diff --git a/configure b/configure index 2dae3f1c7..b8d5b81fc 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 da7c63f4f..def58c466 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"