acinclude.m4 (gxx_include_dir): Quote, fix regression.

2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4 (gxx_include_dir): Quote, fix regression.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r39485

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f87bd3e68b7d06163e26d7176a44ddc06e12244..169ea279503db20d166330c618da355cc7aedd4a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,9 +1,15 @@
-2001-02-05   Benjamin Kosnik  <bkoz@redhat.com>
+2001-02-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * acinclude.m4 (gxx_include_dir): Quote, fix regression.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+       
+2001-02-05  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/bits/locale_facets.h (class moneypunct): Fix typos.
        * libsupc++/pure.cc: Revert.
 
-2001-02-05   Benjamin Kosnik  <bkoz@redhat.com>
+2001-02-05  Benjamin Kosnik  <bkoz@redhat.com>
 
        * acinclude.m4 (GLIBCPP_CHECK_MATH_DECL_1): New macro.
        (GLIBCPP_CHECK_MATH_DECL_2): New macro.

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index d5fcb80ecd19782e22dd377bb6fb69ad9bc1e47f..bbe676b424bcddd67ec6f348fa9d27c3a0db8849 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1539,10 +1539,8 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
 changequote(,)dnl
 gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'`
 gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
-#gcc_date=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $7}'`
-#gcc_version=$gcc_num-$gcc_date
 gcc_version=$gcc_num
-gxx_include_dir=$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++
+gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++'
 changequote([,])dnl
 AC_SUBST(gcc_version)
 AM_CONDITIONAL(VERSION_SPECIFIC_LIBS, test x"$version_specific_libs" = x"yes")

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 5191170d82a272e4ea29d28a6a1f5a779902c6fb..f211cb98861e65f2b8d8706e2b1284e662749f59 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1551,10 +1551,8 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
 changequote(,)dnl
 gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $6}'`
 gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
-#gcc_date=`grep version_string ${srcdir}/../gcc/version.c | awk '{print $7}'`
-#gcc_version=$gcc_num-$gcc_date
 gcc_version=$gcc_num
-gxx_include_dir=$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++
+gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++'
 changequote([,])dnl
 AC_SUBST(gcc_version)
 AM_CONDITIONAL(VERSION_SPECIFIC_LIBS, test x"$version_specific_libs" = x"yes")

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 27deeb28a2c82c2d5363d37a54449fcf2e68b9e8..65d386624f4457b0ea562ff9e61a54e24e326b62 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15758,10 +15758,8 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then
 # is selected.
 gcc_tmp=`grep version_string ${srcdir}/../gcc/version.c | awk '{print }'`
 gcc_num=`echo ${gcc_tmp} | sed 's/\"//g'`
-#gcc_date=`grep version_string ${srcdir}/../gcc/version.c | awk '{print }'`
-#gcc_version=$gcc_num-$gcc_date
 gcc_version=$gcc_num
-gxx_include_dir=$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++
+gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/$(gcc_version)/include/g++'
 
 
 
@@ -15780,7 +15778,7 @@ fi
 echo "$ac_t""$version_specific_libs" 1>&6
 
 echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:15784: checking for install location" >&5
+echo "configure:15782: checking for install location" >&5
 if test x"$version_specific_libs" = x"no" \
    && test x"$gxx_include_dir"=x"no"; then
   gxx_include_dir=${prefix}/include/g++-${libstdcxx_interface}