From e9a393e6ff8bb8314f3ea44cb06486ae2ccff85c Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Tue, 6 Feb 2001 08:18:29 +0000
Subject: [PATCH] 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
---
libstdc++-v3/ChangeLog | 10 ++++++++--
libstdc++-v3/acinclude.m4 | 4 +---
libstdc++-v3/aclocal.m4 | 4 +---
libstdc++-v3/configure | 6 ++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2f87bd3e68b7..169ea279503d 100644
--- 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 d5fcb80ecd19..bbe676b424bc 100644
--- 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 5191170d82a2..f211cb98861e 100644
--- 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 27deeb28a2c8..65d386624f44 100755
--- 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}
--
GitLab