diff --git a/ChangeLog b/ChangeLog index ba716508744429a11d1000b5a7fb2eddc3c06395..ce21d01b14ae0da3451c8ae6f875c986dedb93f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-02-05 Mark Mitchell <mark@codesourcery.com> + + * config.if: Assume enable_libstdcxx_v3 is defined. + 2001-02-04 Mark Mitchell <mark@codesourcery.com> Remove V2 C++ library. diff --git a/config.if b/config.if index 4cac75dc4a480200889317af9199bf001a61b8bf..e8978cae6643ec1a43d96f6b3ad02aaf45082a5b 100644 --- a/config.if +++ b/config.if @@ -21,15 +21,9 @@ else if_topsrcdir=${top_srcdir} fi -if [ "${enable_libstdcxx_v3}" = "yes" ] ; then - libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3 - # We check libstdc++-v3/configure.in for libstdcxx_interface. - libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/configure.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` -else - libstdcxx_srcdir=${if_topsrcdir}/libstdc++ - # We check libstdc++/Makefile.in for libstdcxx_interface. - libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/Makefile.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` -fi +libstdcxx_srcdir=${if_topsrcdir}/libstdc++-v3 +# We check libstdc++-v3/configure.in for libstdcxx_interface. +libstdcxx_interface=`grep "^INTERFACE" ${libstdcxx_srcdir}/configure.in | sed 's/INTERFACE[ ]*=[ ]*\(.*\)/\1/'` libstdcxx_incdir=g++-${libstdcxx_interface} # Used to version libstdc++ shared libraries cxx_interface=2