aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-09-23 19:42:31 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2007-09-23 19:42:31 +0200
commit4c4717752abbed17c278b44ba9891128a5c14e0d (patch)
treea0f803886d2bebe33c62f148b5c4e4425d095189
parentf28797595611bc8c886a54648aac4c93b39f8aed (diff)
downloadgcc-4c4717752abbed17c278b44ba9891128a5c14e0d.zip
gcc-4c4717752abbed17c278b44ba9891128a5c14e0d.tar.gz
gcc-4c4717752abbed17c278b44ba9891128a5c14e0d.tar.bz2
configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
* configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above. * configure: Regenerated. From-SVN: r128693
-rw-r--r--gcc/ChangeLog5
-rwxr-xr-xgcc/configure2
-rw-r--r--gcc/configure.ac2
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 198e24e..0227acd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-23 Jakub Jelinek <jakub@redhat.com>
+
+ * configure.ac (MAKEINFO): Handle makeinfo version 4.10 and above.
+ * configure: Regenerated.
+
2007-09-23 Jan Hubicka <jh@suse.cz>
* params.def (INLINE_CALL_COST): Set to 12.
diff --git a/gcc/configure b/gcc/configure
index a192853..abb1e20 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -7719,7 +7719,7 @@ else
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
- 4.[4-9]*) gcc_cv_prog_makeinfo_modern=yes;;
+ 4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) gcc_cv_prog_makeinfo_modern=yes;;
*) gcc_cv_prog_makeinfo_modern=no;;
esac
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 9627d36..ad957eb 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -841,7 +841,7 @@ AC_CHECK_PROG(have_mktemp_command, mktemp, yes, no)
# that we can use it.
ACX_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
[GNU texinfo.* \([0-9][0-9.]*\)],
- [4.[4-9]*])
+ [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*])
if test $gcc_cv_prog_makeinfo_modern = no; then
AC_MSG_WARN([
*** Makeinfo is missing or too old.