aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--config.if12
2 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ba71650..ce21d01 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 4cac75d..e8978ca 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