Makefile.am (extract_symvers): Revert accidental change.

	* testsuite/Makefile.am (extract_symvers): Revert accidental
	change.
	* testsuite/Makefile.in: Regenerate.

	* configure.in: Pass MULTISUBDIR to testsuite/Makefile.
	* configure: Regenerated.

From-SVN: r68220

5 files changed, 33 insertions, 9 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 30a7c1c..f159c44 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-19  Andreas Jaeger  <aj@suse.de>
+
+	* testsuite/Makefile.am (extract_symvers): Revert accidental
+	change.
+	* testsuite/Makefile.in: Regenerate.
+
+	* configure.in: Pass MULTISUBDIR to testsuite/Makefile.
+	* configure: Regenerated.
+
 2003-06-19  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/std/std_sstream.h (_M_sync): Make non virtual.
@@ -9,7 +18,7 @@
 	(report_performance): New.
 	(start_counters): New.
 	(stop_counters): New.
-	(clear_counters): New.	
+	(clear_counters): New.
 	* testsuite/performance/allocator.cc: Instrument.
 	* testsuite/performance/cout_insert_int.cc: Same.
 	* testsuite/performance/complex_norm.cc: Same.
@@ -19,11 +28,11 @@
 	* testsuite/performance/map_create_fill.cc: Same.
 	* testsuite/performance/ofstream_insert_float.cc: Same.
 	* testsuite/performance/ofstream_insert_int.cc: Same.
-	* testsuite/performance/string_append.cc: Convert.	
+	* testsuite/performance/string_append.cc: Convert.
 	* scripts/check_performance: New.
 	* testsuite/Makefile.am (check-performance): New.
 	(CLEANFILES): Add.
-	
+
 2003-06-18  Paolo Carlini  <pcarlini@unitus.it>
             Benjamin Kosnik  <bkoz@redhat.com>
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9270ed3..3115191 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -24367,6 +24367,11 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
 	 grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
 	 ;;
      esac
+     case $CONFIG_FILES in
+       *testsuite/Makefile*)
+	 grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
+	 ;;
+     esac
    fi
  fi
  chmod +x scripts/check_survey
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index d2512c8..b838a50 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -477,10 +477,10 @@ fi
 AC_SUBST(LIBSUPCXX_PICFLAGS)
 
 # Generate the various Makefiles, include files, and scripts.
-# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
-# and libsupc++/Makefile.am so that multilib installs will end up
-# installed in the correct place. To work around this not being passed
-# down from config-ml.in -> top_srcdir/Makefile.am ->
+# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am,
+# libsupc++/Makefile.am and testsuite/Makefile.am so that multilib installs
+# will end up installed in the correct place. To work around this not being 
+# passed # down from config-ml.in -> top_srcdir/Makefile.am ->
 # top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
 AC_OUTPUT(Makefile \
 include/Makefile src/Makefile \
@@ -506,6 +506,11 @@ po/Makefile testsuite/Makefile scripts/check_survey scripts/testsuite_flags,
 	 grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
 	 ;;
      esac
+     case $CONFIG_FILES in
+       *testsuite/Makefile*)
+	 grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
+	 ;;
+     esac
    fi
  fi
  chmod +x scripts/check_survey
@@ -547,6 +552,11 @@ dnl      *libsupc++/Makefile*)
 dnl        grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
 dnl        ;;
 dnl    esac
+dnl    case $CONFIG_FILES in
+dnl      *testsuite/Makefile*)
+dnl        grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
+dnl        ;;
+dnl    esac
 dnl  fi
 dnl  chmod +x scripts/check_survey
 dnl  chmod +x scripts/testsuite_flags
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 218261b..06705b5 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -87,7 +87,7 @@ check-local: check-abi
 
 baseline_dir = @baseline_dir@
 baseline_file = ${baseline_dir}/baseline_symbols.txt
-extract_symvers = @glibcpp_srcdir@/config/abi/extract_symvers
+extract_symvers = @glibcpp_srcdir@/scripts/extract_symvers
 
 current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
 	  -@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt)
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index ecec0e7..2850829 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -181,7 +181,7 @@ abi_check_SOURCES = abi_check.cc
 
 baseline_dir = @baseline_dir@
 baseline_file = ${baseline_dir}/baseline_symbols.txt
-extract_symvers = @glibcpp_srcdir@/config/abi/extract_symvers
+extract_symvers = @glibcpp_srcdir@/scripts/extract_symvers
 
 # These two special 'check-script' rules use the bash script
 # 'check_survey' to do testing. This script is not as portable as the