2009-04-09 H.J. Lu <hongjiu.lu@intel.com>

	PR gas/10039
	* configure.ac: Require texinfo 4.7.
	* configure: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index 5a3509912c998ddc96008aae097e8d9aa40fdaf3..a7883055727dd8c6a31d281a16aeb004666b0fd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR gas/10039
+       * configure.ac: Require texinfo 4.7.
+       * configure: Regenerated.
+
 2009-04-09  Steve Ellcey  <sje@cup.hp.com>
 
        * Makefil.def (languages): New entries.

diff --git a/configure b/configure
index ecbbce689ba4ba02bbe8bb58e08ca262c8e9722d..87b0187a4a5b9538bc1b577f39d4b7b64e4e15fc 100755 (executable)
--- a/configure
+++ b/configure
@@ -6665,10 +6665,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.6 or
+    # For an installed makeinfo, we require it to be from texinfo 4.7 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([7-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 a34cbe1175b2d280daf000d7ae9d668389c9d415..04ccfd50b7b449bc061bd7a91367006d81744272 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2726,10 +2726,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.6 or
+    # For an installed makeinfo, we require it to be from texinfo 4.7 or
     # higher, else we use the "missing" dummy.
     if ${MAKEINFO} --version \
-       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
+       | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
       :
     else
       MAKEINFO="$MISSING makeinfo"