configure.in (CHECK_SUBDIRS): Set to testsuite only if ${srcdir}/../gcc exists.

	* configure.in (CHECK_SUBDIRS): Set to testsuite only if
	${srcdir}/../gcc exists.
	(configdirs): Include testsuite only if ${srcdir}/../gcc exists.
	* tests/Makefile.in (check): Depend on $(CHECK).
	* tests/configure.in (CHECK): Set to "check-iostream
	check-stdio" if ${srcdir}/../../gcc doesn't exists.

From-SVN: r17336

diff --git a/libio/ChangeLog b/libio/ChangeLog
index 0af11de87b91c32122f987a5abb59bad1c428cda..e7168737bbea77bb792f3b44f36ea3f1a4452c2e 100644 (file)
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jan 13 21:30:33 1998  H.J. Lu  (hjl@gnu.org)
+
+       * configure.in (CHECK_SUBDIRS): Set to testsuite only if
+       ${srcdir}/../gcc exists.
+       (configdirs): Include testsuite only if ${srcdir}/../gcc exists.
+
+       * tests/Makefile.in (check): Depend on $(CHECK).
+
+       * tests/configure.in (CHECK): Set to "check-iostream
+       check-stdio" if ${srcdir}/../../gcc doesn't exists.
+
 1997-12-12  Brendan Kehoe  <brendan@lisa.cygnus.com>
 
        Don't make gperf depend upon libg++.

diff --git a/libio/configure.in b/libio/configure.in
index 63a152a90f175dd7d3bce184f6ff403986b61676..af4a3d6dcdf41c151fea57aeea1ab819074fdd96 100644 (file)
--- a/libio/configure.in
+++ b/libio/configure.in
@@ -2,7 +2,11 @@
 # necessary for a configure script to process the program in
 # this directory.  For more information, look at ../configure.
 
-configdirs="tests dbz stdio testsuite"
+if [ -d ${srcdir}/../gcc ] ; then
+  configdirs="tests dbz stdio testsuite"
+else
+  configdirs="tests dbz stdio"
+fi
 srctrigger=libioP.h
 srcname="input/output library"
 package_makefile_frag=Make.pack
@@ -98,7 +102,7 @@ MOSTLYCLEAN='*.o pic stamp-picdir core iostream.list'
 DISTCLEAN='config.status Makefile *~ Make.pack target-mkfrag multilib.out'
 CLEAN='_G_config.h *.a'
 INFO_FILES=iostream
-if [ -n "${with_cross_host}" ] ; then
+if [ -n "${with_cross_host}" -a -d ${srcdir}/../gcc ] ; then
     CHECK_SUBDIRS=testsuite
 fi
 (. ${srcdir}/config.shared) >${package_makefile_frag}

diff --git a/libio/tests/Makefile.in b/libio/tests/Makefile.in
index 66e88dc64d666a927a0d5f5ea2f68d6f2788fe6e..f93b30046bb2048f31da6d38ecff069d3eb4556c 100644 (file)
--- a/libio/tests/Makefile.in
+++ b/libio/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 1993 Free Software Foundation
+# Copyright (C) 1993, 1998 Free Software Foundation
 # 
 # This file is part of the GNU IO Library.  This library is free
 # software; you can redistribute it and/or modify it under the
@@ -41,9 +41,7 @@ IOSTDIOLIB = ../libio.a ../../libiberty/libiberty.a
 DEPEND_SOURCES = $(srcdir)/*.C
 
 .PHONY: check check-old check-iostream check-stdio
-check:
-
-check-old: check-iostream check-iostdio
+check: $(CHECK)
 
 
 # These are tests written in C++, that test the iostream facility.

diff --git a/libio/tests/configure.in b/libio/tests/configure.in
index f832adfb236350a3a61dab7ede786a76cf728556..2efeaf52565341962692c5c23e648e425128687a 100644 (file)
--- a/libio/tests/configure.in
+++ b/libio/tests/configure.in
@@ -17,5 +17,8 @@ XCINCLUDES='-I. -I.. -I$(srcdir) -I$(srcdir)/..'
 XCXXINCLUDES='-I. -I.. -I$(srcdir) -I$(srcdir)/..'
 MOSTLYCLEAN='*.o core $(JUNK_TO_CLEAN)'
 (. ${srcdir}/../config.shared) >${package_makefile_frag}
+if [ ! -d ${srcdir}/../../gcc ] ; then
+  echo "CHECK = check-iostream check-iostdio" >>${package_makefile_frag}
+fi
 
 # post-target: