* 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.
Fixes multilib problems when srcdir == objdir.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17505 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index 88a4e95..6f3d31a 100644 (file)
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jan 27 10:29:44 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.
+
 Sun Jan 25 14:01:50 1998  Jason Merrill  <jason@yorick.cygnus.com>
 
        * std/bastring.h (unique): We only need length bytes.

diff --git a/libstdc++/configure.in b/libstdc++/configure.in
index 58b468e..352a944 100644 (file)
--- a/libstdc++/configure.in
+++ b/libstdc++/configure.in
@@ -2,7 +2,17 @@
 # necessary for a configure script to process the program in
 # this directory.  For more information, look at ../configure.
 
-if [ -d ${srcdir}/../gcc ] ; then
+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"
@@ -86,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 f642f9f..1266bd2 100644 (file)
--- a/libstdc++/tests/configure.in
+++ b/libstdc++/tests/configure.in
@@ -43,7 +43,18 @@ for TEST in ${TESTS} ; do
   echo '       diff -c $(srcdir)/'"${TEST}.exp ${TEST}.out"  >>Makefile
   CHECK="${CHECK} check-${TEST}"
 done
-if [ -d ${srcdir}/../../gcc ] ; then
+
+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
   echo "
 check:
 check-old: ${CHECK}" >>Makefile
@@ -51,5 +62,3 @@ else
   echo "
 check: ${CHECK}" >>Makefile
 fi
-
-