A libio patch for multilib

[H.J. Lu]

This patch should correct locate the gcc source in
all cases.

Thanks.


-- 
H.J. Lu (hjl@gnu.org)
--
Fri Jan 23 07:58:28 1997  H.J. Lu  (hjl@gnu.org)

	* configure.in (topsrcdir): New.
	(CHECK_SUBDIRS, configdirs): Check ${topsrcdir}/gcc instead.
	(config-ml.in): Use ${topsrcdir}/config-ml.in.

	* tests/configure.in (topsrcdir): New.
	(CHECK): Check ${topsrcdir}/gcc instead.

Index: tests/configure.in
===================================================================
RCS file: /home/work/cvs/gnu/egcs/libio/tests/configure.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 configure.in
--- configure.in	1998/01/16 17:11:59	1.1.1.2
+++ configure.in	1998/01/23 20:02:43
@@ -17,7 +17,18 @@
 XCXXINCLUDES='-I. -I.. -I$(srcdir) -I$(srcdir)/..'
 MOSTLYCLEAN='*.o core $(JUNK_TO_CLEAN)'
 (. ${srcdir}/../config.shared) >${package_makefile_frag}
-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-iostream check-iostdio" >>${package_makefile_frag}
 fi
 
Index: configure.in
===================================================================
RCS file: /home/work/cvs/gnu/egcs/libio/configure.in,v
retrieving revision 1.1.1.8
diff -u -r1.1.1.8 configure.in
--- configure.in	1998/01/16 17:11:31	1.1.1.8
+++ configure.in	1998/01/23 19:51:15
@@ -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 dbz stdio testsuite"
 else
   configdirs="tests dbz stdio"
@@ -102,7 +112,7 @@
 DISTCLEAN='config.status Makefile *~ Make.pack target-mkfrag multilib.out'
 CLEAN='_G_config.h *.a'
 INFO_FILES=iostream
-if [ -n "${with_cross_host}" -a -d ${srcdir}/../gcc ] ; then
+if [ -n "${with_cross_host}" -a -d ${topsrcdir}/gcc ]; then
     CHECK_SUBDIRS=testsuite
 fi
 (. ${srcdir}/config.shared) >${package_makefile_frag}
@@ -120,12 +130,4 @@
     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