* configure.in (libstdcxx_flags): Use libstdc++-v3/src/INCLUDES.

diff --git a/ChangeLog b/ChangeLog
index 435634c7474383317b7d3aecad93bf07fd383f34..afe45a62e3cff775dfe9eecc02d3b83962304604 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-15  Alexandre Oliva  <aoliva@redhat.com>
+
+       * configure.in (libstdcxx_flags): Use libstdc++-v3/src/INCLUDES.
+
 2000-08-11  Jason Merrill  <jason@redhat.com>
 
        * configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET,

diff --git a/configure.in b/configure.in
index 88c6b1736c6ec3523b6ac0f5c61b3ae3cf64afe2..bde0d167ebdf9715378cbeda093d69d1b31252f2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,7 +51,7 @@ fi
 if [ "${enable_libstdcxx_v3}" = "yes" ] && test -d $srcdir/libstdc++-v3; then
         libstdcxx_version="target-libstdc++-v3"
        # Don't use libstdc++-v3's flags to configure/build itself.
-       libstdcxx_flags='`case $$dir in libstdc++-v3) ;; *) test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/mkcheck && $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/mkcheck 2 $$r/$(TARGET_SUBDIR)/libstdc++-v3 $$s/libstdc++-v3 | sed -e '"'s/-I/-isystem /g'"' ;; esac` -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src/.libs'
+       libstdcxx_flags='`case $$dir in libstdc++-v3) ;; *) cat $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/INCLUDES 2>/dev/null || : ;; esac` -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src/.libs'
 else
         libstdcxx_version="target-libio target-libstdc++"
         libstdcxx_flags='-isystem $$s/libstdc++ -isystem $$s/libstdc++/std -isystem $$s/libstdc++/stl -isystem $$s/libio/ -isystem $$s/libio/stdio -L$$r/$(TARGET_SUBDIR)/libstdc++'