summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-14 15:42:18 +0000
committeramodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-14 15:42:18 +0000
commitfbbc6fdbe73dde1b85b992579ce30f6d90ea62e8 (patch)
treef70e8733b6f359b6f120116af45b32e3849f8ba1
parent9b139a12fc77d83560a95c435c03b19a84c34875 (diff)
downloadgcc-fbbc6fdbe73dde1b85b992579ce30f6d90ea62e8.tar.gz
* configure.ac: Correct makeinfo version check.
* configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128497 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ec5c9f6919..996b06450bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-15 Alan Modra <amodra@bigpond.net.au>
+
+ * configure.ac: Correct makeinfo version check.
+ * configure: Regenerate.
+
2007-09-14 Richard Sandiford <rsandifo@nildram.co.uk>
* MAINTAINERS: Update my email address.
diff --git a/configure b/configure
index 91f3168a575..47194cd71ce 100755
--- a/configure
+++ b/configure
@@ -6192,7 +6192,7 @@ case " $build_configdirs " in
# 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\.[4-9]|[5-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(4\.([4-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 a1772c07371..1624f1e898f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2462,7 +2462,7 @@ changequote(,)
# 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\.[4-9]|[5-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"