summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>2006-04-05 00:50:58 +0000
committerbje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>2006-04-05 00:50:58 +0000
commit2c45c903b95a8079077eda8541829c954cdc2f7b (patch)
treef8b4f422798390a00ba6f65c8213f740c3567dac
parent17442a2fabddaae174ad5c45ae1b70949aaa0a32 (diff)
downloadppe42-gcc-2c45c903b95a8079077eda8541829c954cdc2f7b.tar.gz
ppe42-gcc-2c45c903b95a8079077eda8541829c954cdc2f7b.zip
* configure.in: Require makeinfo 4.4 or higher.
* configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112691 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure4
-rw-r--r--configure.in4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 162e2c0cb58..509eaac55b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-05 Ben Elliston <bje@au.ibm.com>
+
+ * configure.in: Require makeinfo 4.4 or higher.
+ * configure: Regenerate.
+
2006-04-04 Gerald Pfeifer <gerald@pfeifer.com>
* MAINTAINERS: Add Richard Henderson as libgomp maintainer.
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"
OpenPOWER on IntegriCloud