diff options
| author | H.J. Lu <hjl@gnu.org> | 1998-01-27 09:34:31 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-01-27 02:34:31 -0700 |
| commit | 4b52c114090ba6e1707778b23d263b3a12b5403a (patch) | |
| tree | 12b3d8897ca463ff7a38c72e300f22b6049647fd | |
| parent | 3fdcc721ffe53f9ed3c48fbf50c62a657d7472f3 (diff) | |
| download | gcc-4b52c114090ba6e1707778b23d263b3a12b5403a.zip gcc-4b52c114090ba6e1707778b23d263b3a12b5403a.tar.gz gcc-4b52c114090ba6e1707778b23d263b3a12b5403a.tar.bz2 | |
configure.in (topsrcdir): New.
* 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.
From-SVN: r17506
| -rw-r--r-- | libio/ChangeLog | 9 | ||||
| -rw-r--r-- | libio/configure.in | 24 | ||||
| -rw-r--r-- | libio/tests/configure.in | 13 |
3 files changed, 34 insertions, 12 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index 59aae9e..36928ba 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,12 @@ +Tue Jan 27 10:35:22 1998 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. + Fri Jan 16 00:48:03 1998 Manfred Hollstein <manfred@lts.sel.alcatel.de> * config.shared (FLAGS_TO_PASS): Add SHELL. diff --git a/libio/configure.in b/libio/configure.in index af4a3d6..e676852 100644 --- a/libio/configure.in +++ b/libio/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 dbz stdio testsuite" else configdirs="tests dbz stdio" @@ -102,7 +112,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}" -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 @@ 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/libio/tests/configure.in b/libio/tests/configure.in index 2efeaf5..1a8ad31 100644 --- a/libio/tests/configure.in +++ b/libio/tests/configure.in @@ -17,7 +17,18 @@ 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 + +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 |