aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2007-09-17 22:44:27 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2007-09-17 22:44:27 +0000
commit4fe7e75560bf9c04b27130f1fa2a737323cf9590 (patch)
tree4c1117deaa11df71cb6f2791a6408ba6a77ce7b6
parentf5678792a361c36001740659a98cddf99cca99ea (diff)
downloadgcc-4fe7e75560bf9c04b27130f1fa2a737323cf9590.zip
gcc-4fe7e75560bf9c04b27130f1fa2a737323cf9590.tar.gz
gcc-4fe7e75560bf9c04b27130f1fa2a737323cf9590.tar.bz2
configure.ac: Raise minimum makeinfo version to 4.6.
* configure.ac: Raise minimum makeinfo version to 4.6. * configure: Regenerate. From-SVN: r128561
-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 da5a772..2a2a1f4 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-17 Johannes Singler <singler@ira.uka.de>
* MAINTAINERS (write-after-approval) add myself
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"