configure.ac (gcc_cv_gld_version): Handle whitespace before "VERSION=".

	* configure.ac (gcc_cv_gld_version): Handle whitespace before
	"VERSION=".
	* aclocal.m4 (_gcc_COMPUTE_GAS_VERSION): Ditto.
	* configure: Regenerate.

From-SVN: r87643

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8088c0c7c38996039be81375357abab048b1d819..6a273d21da38a3aa39f8bd2231a5585986d32f70 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-17  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       * configure.ac (gcc_cv_gld_version): Handle whitespace before
+       "VERSION=".
+       * aclocal.m4 (_gcc_COMPUTE_GAS_VERSION): Ditto.
+       * configure: Regenerate.
+
 2004-09-17  J"orn Rennecke <joern.rennecke@superh.com>
 
        * sh.c (sh_gimplify_va_arg_expr): Don't call pass_by_reference.

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 6f1679e009a53f6b925784d4091cbc1d1023d805..ba49bf42dd3fbaf61f0f8ca52f13915ab81c682c 100644 (file)
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -570,7 +570,7 @@ for f in $gcc_cv_as_bfd_srcdir/configure \
          $gcc_cv_as_gas_srcdir/configure \
          $gcc_cv_as_gas_srcdir/configure.in \
          $gcc_cv_as_gas_srcdir/Makefile.in ; do
-  gcc_cv_gas_version=`grep '^VERSION=[[0-9]]*\.[[0-9]]*' $f`
+  gcc_cv_gas_version=`sed -n -e 's/^[[         ]]*\(VERSION=[[0-9]]*\.[[0-9]]*.*\)/\1/p' < $f`
   if test x$gcc_cv_gas_version != x; then
     break
   fi

diff --git a/gcc/configure b/gcc/configure
index 8a20fd34a8a0fb97a92900c7fff46917e883a1bb..1f9443cb5d73e9199adc0f9a4514e6274933de93 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -10099,7 +10099,7 @@ for f in $gcc_cv_as_bfd_srcdir/configure \
          $gcc_cv_as_gas_srcdir/configure \
          $gcc_cv_as_gas_srcdir/configure.in \
          $gcc_cv_as_gas_srcdir/Makefile.in ; do
-  gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+  gcc_cv_gas_version=`sed -n -e 's/^[  ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f`
   if test x$gcc_cv_gas_version != x; then
     break
   fi
@@ -10234,7 +10234,7 @@ elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
        fi
        for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
        do
-               gcc_cv_gld_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+               gcc_cv_gld_version=`sed -n -e 's/^[     ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f`
                if test x$gcc_cv_gld_version != x; then
                        break
                fi

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 1ae739e7af2206ed9e7032784d927fe985eb3bd1..e7a84662c63e715da349f3a9b4d2526fdb77d8ce 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1872,7 +1872,7 @@ elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
        for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
        do
 changequote(,)dnl
-               gcc_cv_gld_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+               gcc_cv_gld_version=`sed -n -e 's/^[     ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f`
 changequote([,])dnl
                if test x$gcc_cv_gld_version != x; then
                        break