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
This commit is contained in:
parent
f84e0dd314
commit
e9a393e6ff
4 changed files with 12 additions and 12 deletions
|
@ -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.
|
||||
|
|
|
@ -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")
|
||||
|
|
4
libstdc++-v3/aclocal.m4
vendored
4
libstdc++-v3/aclocal.m4
vendored
|
@ -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")
|
||||
|
|
6
libstdc++-v3/configure
vendored
6
libstdc++-v3/configure
vendored
|
@ -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}
|
||||
|
|
Loading…
Add table
Reference in a new issue