diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-01-13 20:28:27 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-01-13 20:28:27 +0000 |
| commit | 15bb9a20c0816e1481ca7a22ec49f0e7c110c663 (patch) | |
| tree | 513b498246d3ea4c48c9d9cbaad405cc3da1c15c /libio | |
| parent | 2f46eabe93d9f94dc275a3c6040304b7103120f0 (diff) | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17336 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/ChangeLog | 11 | ||||
| -rw-r--r-- | libio/configure.in | 8 | ||||
| -rw-r--r-- | libio/tests/Makefile.in | 6 | ||||
| -rw-r--r-- | libio/tests/configure.in | 3 |
4 files changed, 22 insertions, 6 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index 0af11de87b9..e7168737bbe 100644 --- 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 63a152a90f1..af4a3d6dcdf 100644 --- 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 66e88dc64d6..f93b30046bb 100644 --- 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 f832adfb236..2efeaf52565 100644 --- 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: |