From d18ff35aff6a6a47b336b6e61ea8c645823c6230 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl@gcc.gnu.org>
Date: Thu, 9 Apr 2009 08:44:05 -0700
Subject: [PATCH] re PR c++/10039 ([macosx] gcc hangs at a c++-Constructor with
 switch "-Os")

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

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

From-SVN: r145842
---
 ChangeLog    | 18 ++++++++++++------
 configure    |  4 ++--
 configure.ac |  4 ++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b22f481afb..553cdeefc9f 100644
--- 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  Nick Clifton  <nickc@redhat.com>
 
 	* COPYING.RUNTIME: New file: Contains a copy of version 3.1 of
@@ -17,15 +23,15 @@
 
 2009-03-25  Erven Rohou <erven.rohou@inria.fr>
 
-        * MAINTAINERS:  Update my email address.
+	* MAINTAINERS:  Update my email address.
 
 2009-03-18  Tom Tromey  <tromey@redhat.com>
 
-        * configure: Rebuild.
-        * configure.ac (host_libs): Add libiconv.
-        * Makefile.in: Rebuild.
-        * Makefile.def (host_modules): Add libiconv.
-        (configure-gdb, all-gdb): Depend on libiconv.
+	* configure: Rebuild.
+	* configure.ac (host_libs): Add libiconv.
+	* Makefile.in: Rebuild.
+	* Makefile.def (host_modules): Add libiconv.
+	(configure-gdb, all-gdb): Depend on libiconv.
 
 2009-03-16  Tristan Gingold  <gingold@adacore.com>
 
diff --git a/configure b/configure
index 8f29c6201e8..bfb1d6b81f8 100755
--- 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 2a8c746ae88..fd961226481 100644
--- 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"