* configure.in: Do not assume that gas's version number is the

	last thing on the first line of as --version output.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46629 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54698ba..c9cd68e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-29  Zack Weinberg  <zack@codesourcery.com>
 
+       * configure.in: Do not assume that gas's version number is the
+       last thing on the first line of as --version output.
+       * configure: Regenerate.
+       
        * tradcpp.c: Include intl.h.  Rename WARNING, ERROR, FATAL to
        MT_WARNING, MT_ERROR, MT_FATAL.
        (main): Call gcc_init_libintl.

diff --git a/gcc/configure b/gcc/configure
index 094f2d0..9ddc44f 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -7207,7 +7207,7 @@ EOF
                # arbitrary sections are supported and try the test.
                as_ver=`$gcc_cv_as --version 2>/dev/null | head -1`
                if echo "$as_ver" | grep GNU > /dev/null; then
-                       as_ver=`echo $as_ver | sed -e 's/.* //'`
+                       as_ver=`echo $as_ver | sed -e 's/.* \([0-9.][0-9.]*\) .*/\1/'`
                        as_major=`echo $as_ver | sed 's/\..*//'`
                        as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
                        if test $as_major -eq 2 -a $as_minor -lt 11; then

diff --git a/gcc/configure.in b/gcc/configure.in
index 89cc802..2e32cf1 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1382,9 +1382,9 @@ EOF
                # arbitrary sections are supported and try the test.
                as_ver=`$gcc_cv_as --version 2>/dev/null | head -1`
                if echo "$as_ver" | grep GNU > /dev/null; then
-                       as_ver=`echo $as_ver | sed -e 's/.* //'`
-                       as_major=`echo $as_ver | sed 's/\..*//'`
 changequote(,)dnl
+                       as_ver=`echo $as_ver | sed -e 's/.* \([0-9.][0-9.]*\) .*/\1/'`
+                       as_major=`echo $as_ver | sed 's/\..*//'`
                        as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
 changequote([,])dnl
                        if test $as_major -eq 2 -a $as_minor -lt 11; then