From 0461a052b892c7e2cc40cf836f8454cf0f6370f8 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Tue, 30 Oct 2001 04:57:42 +0000 Subject: [PATCH] configure.in: Do not assume that gas's version number is the last thing on the first line of... * configure.in: Do not assume that gas's version number is the last thing on the first line of as --version output. * configure: Regenerate. From-SVN: r46629 --- gcc/ChangeLog | 4 ++++ gcc/configure | 2 +- gcc/configure.in | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 54698ba7d91..c9cd68e5a86 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2001-10-29 Zack Weinberg + * 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 094f2d0f3e6..9ddc44ff67f 100755 --- 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 89cc802e53f..2e32cf1ed9e 100644 --- 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 -- 2.30.2