testsuite_flags.in (build-includes): Re-add backward.

        * testsuite_flags.in (build-includes): Re-add backward.
(and back out earlier aclocal change)

From-SVN: r45139

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4713cf9ba5afc154a76348f8c6f09ddb4d08ee0e..95b7ad92895c8c87cd4b182a1f61d9b1e149d6ce 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,6 +1,6 @@
 2001-08-23  Jason Merrill  <jason_merrill@redhat.com>
 
-       * aclocal.m4 (GLIBCPP_INCLUDES): Include backward.
+       * testsuite_flags.in (build-includes): Re-add backward.
 
 2001-08-22  Benjamin Kosnik  <bkoz@redhat.com>
 

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 028f6430fb2310d537d252aaa52cc3a0db2e0c12..b83c7a76c966ed5b89cb0382f1238f99565fee07 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1613,8 +1613,7 @@ dnl
 dnl GLIBCPP_EXPORT_INCLUDES
 AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include \
-                   -I${glibcpp_builddir}/include/backward"
+  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 83559ad7107aab82ac7f5d16773ed7a98df23bea..cbd02b480b86ed547d035c8cef2dfc9d416cfbaa 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -17395,8 +17395,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
 # Export all the include and flag information to makefiles.
 
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include \
-                   -I${glibcpp_builddir}/include/backward"
+  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then

diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in
index 553a4333290261735c8c9dc327377b6b0ab32f27..335e08585cd797eb7052673ce4f8d20909d625a4 100755 (executable)
--- a/libstdc++-v3/testsuite_flags.in
+++ b/libstdc++-v3/testsuite_flags.in
@@ -34,6 +34,7 @@ case ${query} in
     --build-includes)
       INCLUDES="-nostdinc++ @GLIBCPP_INCLUDES@
                -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio 
+               -I${SRC_DIR}/include/backward 
                -I${SRC_DIR}/testsuite -I${BUILD_DIR}/testsuite"
       echo ${INCLUDES}
       ;;