A make check patch

[H.J. Lu]

> 
> Dear Mr. Lu,
> 
> I installed the egcs-980115 compiler on a different
> i386-gnulibc1-system. The dejagnu based libio testsuite runs as expected.
> 
> I configured this system with ./configure --disable-multilibs.
> 
> The other was configured with plain ./configure, no dejagnu based libio 
> testsuite runs.
> 
> I believe that this could be the answer to the problem.
> 
> Your code looks for ${srcdir}/../gcc which is not true with multilibs
> enabled, the default, since they are located one level deeper in
> ${srcdir}/libraries/libio.
> 

Thanks. Here is the patch for it.


H.J.
---
Sun Jan 18 17:53:02 1997  H.J. Lu  (hjl@gnu.org)

	* configure.in (CHECK_SUBDIRS, configdirs): Also check if
	${srcdir}/../../gcc exists.

	* tests/configure.in (CHECK): Also check ${srcdir}/../../../gcc.

Index: libio/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/19 03:21:05
@@ -2,7 +2,7 @@
 # necessary for a configure script to process the program in
 # this directory.  For more information, look at ../configure.
 
-if [ -d ${srcdir}/../gcc ] ; then
+if [ -d ${srcdir}/../gcc -o -d ${srcdir}/../../gcc ] ; then
   configdirs="tests dbz stdio testsuite"
 else
   configdirs="tests dbz stdio"
@@ -102,8 +102,10 @@
 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}" ]; then
+  if [ -d ${srcdir}/../gcc -o -d ${srcdir}/../../gcc  ] ; then
     CHECK_SUBDIRS=testsuite
+  fi
 fi
 (. ${srcdir}/config.shared) >${package_makefile_frag}
 
Index: libio/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/19 01:55:17
@@ -17,7 +17,7 @@
 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 [ ! -d ${srcdir}/../../gcc -a ! -d ${srcdir}/../../../gcc ] ; then
   echo "CHECK = check-iostream check-iostdio" >>${package_makefile_frag}
 fi
 


Sun Jan 18 17:53:02 1997  H.J. Lu  (hjl@gnu.org)

	* configure.in (configdirs): Also check if ${srcdir}/../../gcc
	exists.

	* tests/configure.in (check): Also check ${srcdir}/../../../gcc.

Index: libstdc++/tests/configure.in
===================================================================
RCS file: /home/work/cvs/gnu/egcs/libstdc++/tests/configure.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 configure.in
--- configure.in	1998/01/16 17:12:28	1.1.1.2
+++ configure.in	1998/01/19 01:58:16
@@ -43,7 +43,7 @@
   echo '	diff -c $(srcdir)/'"${TEST}.exp ${TEST}.out"  >>Makefile
   CHECK="${CHECK} check-${TEST}"
 done
-if [ -d ${srcdir}/../../gcc ] ; then
+if [ -d ${srcdir}/../../gcc -o -d ${srcdir}/../../../gcc ] ; then
   echo "
 check:
 check-old: ${CHECK}" >>Makefile
Index: libstdc++/configure.in
===================================================================
RCS file: /home/work/cvs/gnu/egcs/libstdc++/configure.in,v
retrieving revision 1.1.1.5
diff -u -r1.1.1.5 configure.in
--- configure.in	1998/01/16 17:12:07	1.1.1.5
+++ configure.in	1998/01/19 01:49:08
@@ -2,7 +2,7 @@
 # necessary for a configure script to process the program in
 # this directory.  For more information, look at ../configure.
 
-if [ -d ${srcdir}/../gcc ] ; then
+if [ -d ${srcdir}/../gcc -o -d ${srcdir}/../../gcc ] ; then
   configdirs="tests testsuite"
 else
   configdirs="tests"