configure.in (topsrcdir): New.

        * configure.in (topsrcdir): New.
        (configdirs): Check ${topsrcdir}/gcc instead.
        (config-ml.in): Use ${topsrcdir}/config-ml.in.
        * tests/configure.in (topsrcdir): New.
        (check): Check ${topsrcdir}/gcc instead.
        * configure.in (configdirs): Include testsuite only if
        ${srcdir}/../gcc exists.
        * tests/configure.in (check): Set to ${CHECK} if
        ${srcdir}/../../gcc doesn't exists.

From-SVN: r18219

3 files changed, 44 insertions, 56 deletions

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index b61eb05d529..c296d5242b4 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,18 @@
+Tue Feb 24 20:56:03 1998  H.J. Lu  (hjl@gnu.org)
+
+	* configure.in (topsrcdir): New.
+	(configdirs): Check ${topsrcdir}/gcc instead.
+	(config-ml.in): Use ${topsrcdir}/config-ml.in.
+
+	* tests/configure.in (topsrcdir): New.
+	(check): Check ${topsrcdir}/gcc instead.
+
+	* configure.in (configdirs): Include testsuite only if
+	${srcdir}/../gcc exists.
+
+	* tests/configure.in (check): Set to ${CHECK} if
+	${srcdir}/../../gcc doesn't exists.
+
 1998-02-18  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* std/bastring.h: Don't #include <std/bastring.cc> yet.
diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index efc2f55cd13..352a94489d8 100644
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -2,7 +2,21 @@
 # necessary for a configure script to process the program in
 # this directory.  For more information, look at ../configure.
 
-configdirs="tests testsuite"
+if [ "${srcdir}" = "." ] ; then
+  if [ "${with_target_subdir}" != "." ] ; then
+    topsrcdir=${with_multisrctop}../..
+  else
+    topsrcdir=${with_multisrctop}..
+  fi
+else
+  topsrcdir=${srcdir}/..
+fi
+
+if [ -d ${topsrcdir}/gcc ] ; then
+  configdirs="tests testsuite"
+else
+  configdirs="tests"
+fi
 srctrigger=sinst.cc
 srcname="ANSI C++ library"
 package_makefile_frag=Make.pack
@@ -82,12 +96,4 @@ if [ -n "${with_cross_host}" ] ; then
     mv -f Makefile.tem Makefile
 fi
 
-if [ "${srcdir}" = "." ] ; then
-  if [ "${with_target_subdir}" != "." ] ; then
-    . ${with_multisrctop}../../config-ml.in
-  else
-    . ${with_multisrctop}../config-ml.in
-  fi
-else
-  . ${srcdir}/../config-ml.in
-fi
+. ${topsrcdir}/config-ml.in
diff --git a/libstdc++/tests/configure.in b/libstdc++/tests/configure.in
index ebcef863523..dd4051dcf9e 100644
--- a/libstdc++/tests/configure.in
+++ b/libstdc++/tests/configure.in
@@ -1,50 +1,17 @@
-# This file is a shell script fragment that supplies the information
-# necessary for a configure script to process the program in
-# this directory.  For more information, look at ../../configure.
-
-configdirs=
-srctrigger=tcomplex.cc
-srcname="tests for ANSI C++ library"
-package_makefile_frag=Make.pack
-
-# per-host:
-
-# per-target:
-
-target_makefile_frag=../target-mkfrag
-
-TO_TOPDIR=../../
-ALL=' '
-XCXXINCLUDES="-I${srcdir}/.. -I${srcdir}/../stl -I${TO_TOPDIR}libio -I${srcdir}/${TO_TOPDIR}libio"
-SIMPLE_TESTS='tstring tlist tmap tvector'
-TESTS="tcomplex ${SIMPLE_TESTS}"
-MOSTLYCLEAN="*.o core ${TESTS} *.out"
-(. ${srcdir}/${TO_TOPDIR}libio/config.shared) >${package_makefile_frag}
-
-# post-target:
-
-CHECK=""
-
-for TEST in ${SIMPLE_TESTS} ; do
-  echo "${TEST}: ${TEST}.o" '$(DEPLIBS)
-	$(CXX) $(CXXFLAGS) -o' "${TEST} ${TEST}.o" '$(LDLIBS)
-' >> Makefile
-done
-
-for TEST in ${TESTS} ; do
-  echo ".PHONY: check-${TEST}" >>Makefile
-  if [ -f ${srcdir}/${TEST}.inp ] ; then
-    echo "check-${TEST}: ${TEST}" '$(srcdir)'"/${TEST}.inp
-	./${TEST} < "'$(srcdir)'"/${TEST}.inp > ${TEST}.out 2>&1" >>Makefile
+if [ "${srcdir}" = "." ] ; then
+  if [ "${with_target_subdir}" != "." ] ; then
+    topsrcdir=${with_multisrctop}../../..
   else
-    echo "check-${TEST}: ${TEST}
-	./${TEST} > ${TEST}.out 2>&1"  >>Makefile
+    topsrcdir=${with_multisrctop}../..
   fi
-  echo '	diff -c $(srcdir)/'"${TEST}.exp ${TEST}.out"  >>Makefile
-  CHECK="${CHECK} check-${TEST}"
-done
-echo "
+else
+  topsrcdir=${srcdir}/../..
+fi
+if [ -d ${topsrcdir}/gcc ] ; then
+  echo "
 check:
 check-old: ${CHECK}" >>Makefile
-
-
+else
+  echo "
+check: ${CHECK}" >>Makefile
+fi