acinclude problem with gcc_version

[Hidvegi]

There is a bug in acinclude.m4 in the computation of gcc_version, m4
expands $6.

Index: libstdc++-v3/aclocal.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/aclocal.m4,v
retrieving revision 1.131
diff -u -r1.131 aclocal.m4
--- aclocal.m4	2001/02/06 08:18:29	1.131
+++ aclocal.m4	2001/02/07 16:16:42
@@ -1548,8 +1548,8 @@
 # Need the gcc compiler version to know where to install libraries
 # and header files if --enable-version-specific-runtime-libs option
 # is selected.
-changequote(,)dnl
-gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'`
+changequote(<,>)dnl
+gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $<>6}'`
 gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
 gcc_version=$gcc_num
 gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++'
Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
retrieving revision 1.128
diff -u -r1.128 acinclude.m4
--- acinclude.m4	2001/02/06 08:18:29	1.128
+++ acinclude.m4	2001/02/07 16:16:43
@@ -1536,8 +1536,8 @@
 # Need the gcc compiler version to know where to install libraries
 # and header files if --enable-version-specific-runtime-libs option
 # is selected.
-changequote(,)dnl
-gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'`
+changequote(<,>)dnl
+gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $<>6}'`
 gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
 gcc_version=$gcc_num
 gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++'
Index: libstdc++-v3/configure
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure,v
retrieving revision 1.146
diff -u -r1.146 configure
--- configure	2001/02/06 08:18:29	1.146
+++ configure	2001/02/07 16:16:51
@@ -15756,7 +15756,7 @@
 # Need the gcc compiler version to know where to install libraries
 # and header files if --enable-version-specific-runtime-libs option
 # is selected.
-gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print }'`
+gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'`
 gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
 gcc_version=$gcc_num
 gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++'