[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CONF_SUBDIRS in Makefile.am; test suite & DJGPP [PATCH]
|
From: |
Robert Boehne |
|
Subject: |
Re: CONF_SUBDIRS in Makefile.am; test suite & DJGPP [PATCH] |
|
Date: |
Fri, 28 Mar 2003 23:04:54 -0600 |
Approved and checking in.
Thanks,
Robert
Richard Dawe wrote:
>
> Hello.
>
> Please find below a patch (including a ChangeLog entry) against
> current libtool CVS that addresses the following:
>
> * When I bootstrapped, automake warned me that CONF_SUBDIRS was used
> but not defined. I can't remember the exact error message. I added
> an @-subsitution for CONF_SUBDIRS to Makefile.am. If this is
> incorrect, then I suggest that usages of $(CONF_SUBDIRS) are removed
> from Makefile.am.
>
> * The port of autoconf to DJGPP requires the config.site distributed
> with it to work correctly. The test suite overrides CONFIG_SITE
> in some tests and points it at a non-existent file. Then
> the test suite does not work correctly.
>
> The patch below moves the setting of CONFIG_SITE into tests/defs
> from individual tests. For DJGPP it does not override CONFIG_SITE
> in tests/defs, so that the DJGPP port of autoconf can use
> its config.site file.
>
> * Some of the tests check for the existence of an executable file
> using "test -f somedir/someprog". (Clearly somedir and somefile are
> example filenames.) Under DJGPP the executable will be called
> somedir/someprog.exe.
>
> The patch below changes the "test -f somedir/someprog" checks
> to "test -f somedir/someprog$EXEEXT".
>
> With these patches, libtool CVS works and passes most of the test suite
> out-of-the-box with DJGPP. The tests it fails are expected,
> because they are for shared libraries, which DJGPP does not support.
>
> I'd be keen for these patches to go in before the libtool 1.5 release.
> Please let me if anything needs doing to them, before they can be
> committed.
>
> Thanks, bye, Rich =]
>
> Index: ChangeLog
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/ChangeLog,v
> retrieving revision 1.1192
> diff -p -u -3 -r1.1192 ChangeLog
> --- ChangeLog 18 Feb 2003 05:15:03 -0000 1.1192
> +++ ChangeLog 19 Feb 2003 19:46:23 -0000
> @@ -1,3 +1,32 @@
> +2003-02-19 Richard Dawe <address@hidden>
> +
> + * Makefile.am: Define CONF_SUBDIRS.
> +
> + * tests/defs: Set CONFIG_SITE to /nonexistent, except on DJGPP,
> + which requires its config.site, to work correctly.
> +
> + * tests/cdemo-conf.test, tests/cdemo-shared.test,
> + tests/cdemo-static.test, tests/demo-conf.test,
> + tests/demo-nofast.test, tests/demo-nopic.test,
> + tests/demo-pic.test, tests/demo-shared.test,
> + tests/demo-static.test, tests/depdemo-conf.test,
> + tests/depdemo-nofast.test, tests/depdemo-shared.test,
> + tests/depdemo-static.test, tests/f77demo-conf.test,
> + tests/f77demo-shared.test, tests/f77demo-static.test,
> + tests/mdemo-conf.test, tests/mdemo-shared.test,
> + tests/mdemo-static.test, tests/pdemo-conf.test,
> + tests/tagdemo-conf.test, tests/tagdemo-shared.test,
> + tests/tagdemo-static.test: Don't set CONFIG_SITE, now that
> + tests/defs sets it.
> +
> + * tests/cdemo-exec.test, tests/demo-exec.test,
> + tests/demo-inst.test, tests/depdemo-exec.test,
> + tests/depdemo-inst.test, tests/f77demo-exec.test,
> + tests/mdemo-exec.test, tests/mdemo-inst.test,
> + tests/pdemo-exec.test, tests/pdemo-inst.test,
> + tests/tagdemo-exec.test: When checking for the existence
> + of executables, use the executable file extension from $EXEEXT.
> +
> 2003-02-17 Allan Sandfeld Jensen <address@hidden>
>
> * libtool.m4: Intel icc fixups for version 7.0.
> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/Makefile.am,v
> retrieving revision 1.67
> diff -p -u -3 -r1.67 Makefile.am
> --- Makefile.am 25 Oct 2002 01:14:07 -0000 1.67
> +++ Makefile.am 19 Feb 2003 19:46:23 -0000
> @@ -3,6 +3,7 @@
> AUTOMAKE_OPTIONS = 1.3e gnu
>
> BUILD_SUBDIRS = . libltdl doc tests
> +CONF_SUBDIRS = @CONF_SUBDIRS@
> SUBDIRS = $(BUILD_SUBDIRS)
> DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
>
> Index: tests/cdemo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/cdemo-conf.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 cdemo-conf.test
> --- tests/cdemo-conf.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/cdemo-conf.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../cdemo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure
> --srcdir=$srcdir/../cdemo --prefix=$prefix || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo
> --prefix=$prefix || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/cdemo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/cdemo-exec.test,v
> retrieving revision 1.2
> diff -p -u -3 -r1.2 cdemo-exec.test
> --- tests/cdemo-exec.test 19 Mar 1999 17:58:46 -0000 1.2
> +++ tests/cdemo-exec.test 19 Feb 2003 19:46:24 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../cdemo/cdemo; then :
> +if test -f ../cdemo/cdemo$EXEEXT; then :
> else
> echo "You must run cdemo-make.test before running $0" 1>&2
> exit 77
> Index: tests/cdemo-shared.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/cdemo-shared.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 cdemo-shared.test
> --- tests/cdemo-shared.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/cdemo-shared.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../cdemo (prefix=$prefix) with --disable-static"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure
> --srcdir=$srcdir/../cdemo --prefix=$prefix --disable-static || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo
> --prefix=$prefix --disable-static || exit 1
>
> if grep '^build_old_libs=no' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/cdemo-static.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/cdemo-static.test,v
> retrieving revision 1.6
> diff -p -u -3 -r1.6 cdemo-static.test
> --- tests/cdemo-static.test 19 Nov 2002 09:42:39 -0000 1.6
> +++ tests/cdemo-static.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../cdemo (prefix=$prefix) with --disable-shared"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure
> --srcdir=$srcdir/../cdemo --prefix=$prefix --disable-shared || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo
> --prefix=$prefix --disable-shared || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=no' libtool > /dev/null; then :
> Index: tests/defs
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/defs,v
> retrieving revision 1.3
> diff -p -u -3 -r1.3 defs
> --- tests/defs 19 Nov 2002 09:42:39 -0000 1.3
> +++ tests/defs 19 Feb 2003 19:46:24 -0000
> @@ -38,6 +38,12 @@ fi
> # Extract CC from the libtool configuration
> eval `$libtool --config | grep '^CC='`
>
> +# Disable usage of config.site for autoconf, unless DJGPP is present.
> +# The DJGPP port of autoconf requires config.site, to work correctly.
> +if test -z $DJGPP; then
> + CONFIG_SITE=/nonexistent
> +fi
> +
> # See how redirections should work.
> case "$VERBOSE" in
> NO | no | 0 | "")
> Index: tests/demo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-conf.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 demo-conf.test
> --- tests/demo-conf.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/demo-conf.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../demo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure
> --srcdir=$srcdir/../demo --prefix=$prefix || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo
> --prefix=$prefix || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/demo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-exec.test,v
> retrieving revision 1.7
> diff -p -u -3 -r1.7 demo-exec.test
> --- tests/demo-exec.test 19 Nov 2002 09:42:39 -0000 1.7
> +++ tests/demo-exec.test 19 Feb 2003 19:46:24 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../demo/hell; then :
> +if test -f ../demo/hell$EXEEXT; then :
> else
> echo "You must run demo-make.test before running $0" 1>&2
> exit 77
> Index: tests/demo-inst.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-inst.test,v
> retrieving revision 1.7
> diff -p -u -3 -r1.7 demo-inst.test
> --- tests/demo-inst.test 19 Nov 2002 09:42:39 -0000 1.7
> +++ tests/demo-inst.test 19 Feb 2003 19:46:24 -0000
> @@ -11,7 +11,7 @@ fi
> . $srcdir/defs || exit 1
>
> # Check that things are built.
> -if test -f ../demo/hell; then :
> +if test -f ../demo/hell$EXEEXT; then :
> else
> echo "You must run demo-make.test before $0" 1>&2
> exit 77
> Index: tests/demo-nofast.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-nofast.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 demo-nofast.test
> --- tests/demo-nofast.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/demo-nofast.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../demo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure
> --srcdir=$srcdir/../demo --prefix=$prefix --enable-fast-install=no || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo
> --prefix=$prefix --enable-fast-install=no || exit 1
>
> if grep '^hardcode_action=relink' libtool > /dev/null; then
> rm -f Makefile && exit 77
> Index: tests/demo-nopic.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-nopic.test,v
> retrieving revision 1.3
> diff -p -u -3 -r1.3 demo-nopic.test
> --- tests/demo-nopic.test 18 Nov 2002 15:37:05 -0000 1.3
> +++ tests/demo-nopic.test 19 Feb 2003 19:46:24 -0000
> @@ -25,6 +25,6 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../demo (prefix=$prefix) with --without-pic"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure
> --srcdir=$srcdir/../demo --prefix=$prefix --with-pic=no || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo
> --prefix=$prefix --with-pic=no || exit 1
>
> exit 0
> Index: tests/demo-pic.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-pic.test,v
> retrieving revision 1.3
> diff -p -u -3 -r1.3 demo-pic.test
> --- tests/demo-pic.test 18 Nov 2002 15:37:05 -0000 1.3
> +++ tests/demo-pic.test 19 Feb 2003 19:46:24 -0000
> @@ -25,6 +25,6 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../demo (prefix=$prefix) with --with-pic"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure
> --srcdir=$srcdir/../demo --prefix=$prefix --with-pic=yes || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo
> --prefix=$prefix --with-pic=yes || exit 1
>
> exit 0
> Index: tests/demo-shared.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-shared.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 demo-shared.test
> --- tests/demo-shared.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/demo-shared.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../demo (prefix=$prefix) with --disable-static"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure
> --srcdir=$srcdir/../demo --prefix=$prefix --disable-static || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo
> --prefix=$prefix --disable-static || exit 1
>
> if grep '^build_old_libs=no' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/demo-static.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/demo-static.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 demo-static.test
> --- tests/demo-static.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/demo-static.test 19 Feb 2003 19:46:24 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../demo (prefix=$prefix) with --disable-shared"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure
> --srcdir=$srcdir/../demo --prefix=$prefix --disable-shared || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo
> --prefix=$prefix --disable-shared || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=no' libtool > /dev/null; then :
> Index: tests/depdemo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/depdemo-conf.test,v
> retrieving revision 1.6
> diff -p -u -3 -r1.6 depdemo-conf.test
> --- tests/depdemo-conf.test 19 Nov 2002 09:42:39 -0000 1.6
> +++ tests/depdemo-conf.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../depdemo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix ||
> exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure
> --srcdir=$srcdir/../depdemo --prefix=$prefix || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/depdemo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/depdemo-exec.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 depdemo-exec.test
> --- tests/depdemo-exec.test 3 Mar 2002 03:19:55 -0000 1.4
> +++ tests/depdemo-exec.test 19 Feb 2003 19:46:25 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../depdemo/depdemo; then :
> +if test -f ../depdemo/depdemo$EXEEXT; then :
> else
> echo "You must run depdemo-make.test before running $0" 1>&2
> exit 77
> Index: tests/depdemo-inst.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/depdemo-inst.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 depdemo-inst.test
> --- tests/depdemo-inst.test 3 Mar 2002 03:19:55 -0000 1.4
> +++ tests/depdemo-inst.test 19 Feb 2003 19:46:25 -0000
> @@ -11,7 +11,7 @@ fi
> . $srcdir/defs || exit 1
>
> # Check that things are built.
> -if test -f ../depdemo/depdemo; then :
> +if test -f ../depdemo/depdemo$EXEEXT; then :
> else
> echo "You must run depdemo-make.test before $0" 1>&2
> exit 77
> Index: tests/depdemo-nofast.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/depdemo-nofast.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 depdemo-nofast.test
> --- tests/depdemo-nofast.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/depdemo-nofast.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../depdemo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix
> --enable-fast-install=no || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure
> --srcdir=$srcdir/../depdemo --prefix=$prefix --enable-fast-install=no || exit
> 1
>
> if grep '^hardcode_action=relink' libtool > /dev/null; then
> rm -f Makefile && exit 77
> Index: tests/depdemo-shared.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/depdemo-shared.test,v
> retrieving revision 1.6
> diff -p -u -3 -r1.6 depdemo-shared.test
> --- tests/depdemo-shared.test 19 Nov 2002 09:42:39 -0000 1.6
> +++ tests/depdemo-shared.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../depdemo (prefix=$prefix) with --disable-static"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix
> --disable-static || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure
> --srcdir=$srcdir/../depdemo --prefix=$prefix --disable-static || exit 1
>
> if grep '^build_old_libs=no' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/depdemo-static.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/depdemo-static.test,v
> retrieving revision 1.6
> diff -p -u -3 -r1.6 depdemo-static.test
> --- tests/depdemo-static.test 19 Nov 2002 09:42:39 -0000 1.6
> +++ tests/depdemo-static.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../depdemo (prefix=$prefix) with --disable-shared"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix
> --disable-shared || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure
> --srcdir=$srcdir/../depdemo --prefix=$prefix --disable-shared || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=no' libtool > /dev/null; then :
> Index: tests/f77demo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/f77demo-conf.test,v
> retrieving revision 1.3
> diff -p -u -3 -r1.3 f77demo-conf.test
> --- tests/f77demo-conf.test 19 Nov 2002 09:42:39 -0000 1.3
> +++ tests/f77demo-conf.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../f77demo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../f77demo/configure --srcdir=$srcdir/../f77demo --prefix=$prefix ||
> exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../f77demo/configure
> --srcdir=$srcdir/../f77demo --prefix=$prefix || exit 1
>
> if $EGREP '^build_old_libs=yes' libtool > /dev/null &&
> $EGREP '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/f77demo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/f77demo-exec.test,v
> retrieving revision 1.2
> diff -p -u -3 -r1.2 f77demo-exec.test
> --- tests/f77demo-exec.test 19 Nov 2002 09:42:39 -0000 1.2
> +++ tests/f77demo-exec.test 19 Feb 2003 19:46:25 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../f77demo/fprogram && test -f ../f77demo/cprogram; then :
> +if test -f ../f77demo/fprogram$EXEEXT && test -f ../f77demo/cprogram$EXEEXT;
> then :
> else
> echo "You must run f77demo-make.test before running $0" 1>&2
> exit 77
> Index: tests/f77demo-shared.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/f77demo-shared.test,v
> retrieving revision 1.3
> diff -p -u -3 -r1.3 f77demo-shared.test
> --- tests/f77demo-shared.test 19 Nov 2002 09:42:39 -0000 1.3
> +++ tests/f77demo-shared.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../f77demo (prefix=$prefix) with --disable-static"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../f77demo/configure --srcdir=$srcdir/../f77demo --prefix=$prefix
> --disable-static || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../f77demo/configure
> --srcdir=$srcdir/../f77demo --prefix=$prefix --disable-static || exit 1
>
> if $EGREP '^build_old_libs=no' libtool > /dev/null &&
> $EGREP '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/f77demo-static.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/f77demo-static.test,v
> retrieving revision 1.3
> diff -p -u -3 -r1.3 f77demo-static.test
> --- tests/f77demo-static.test 19 Nov 2002 09:42:39 -0000 1.3
> +++ tests/f77demo-static.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../f77demo (prefix=$prefix) with --disable-shared"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../f77demo/configure --srcdir=$srcdir/../f77demo --prefix=$prefix
> --disable-shared || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../f77demo/configure
> --srcdir=$srcdir/../f77demo --prefix=$prefix --disable-shared || exit 1
>
> if $EGREP '^build_old_libs=yes' libtool > /dev/null &&
> $EGREP '^build_libtool_libs=no' libtool > /dev/null; then :
> Index: tests/mdemo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/mdemo-conf.test,v
> retrieving revision 1.8
> diff -p -u -3 -r1.8 mdemo-conf.test
> --- tests/mdemo-conf.test 19 Nov 2002 09:42:39 -0000 1.8
> +++ tests/mdemo-conf.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../mdemo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure
> --srcdir=$srcdir/../mdemo --prefix=$prefix || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo
> --prefix=$prefix || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/mdemo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/mdemo-exec.test,v
> retrieving revision 1.11
> diff -p -u -3 -r1.11 mdemo-exec.test
> --- tests/mdemo-exec.test 3 Mar 2002 03:19:55 -0000 1.11
> +++ tests/mdemo-exec.test 19 Feb 2003 19:46:25 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../mdemo/mdemo; then :
> +if test -f ../mdemo/mdemo$EXEEXT; then :
> else
> echo "You must run mdemo-make.test before running $0" 1>&2
> exit 77
> Index: tests/mdemo-inst.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/mdemo-inst.test,v
> retrieving revision 1.13
> diff -p -u -3 -r1.13 mdemo-inst.test
> --- tests/mdemo-inst.test 22 Oct 2002 19:29:28 -0000 1.13
> +++ tests/mdemo-inst.test 19 Feb 2003 19:46:25 -0000
> @@ -11,7 +11,7 @@ fi
> . $srcdir/defs || exit 1
>
> # Check that things are built.
> -if test -f ../mdemo/mdemo; then :
> +if test -f ../mdemo/mdemo$EXEEXT; then :
> else
> echo "You must run mdemo-make.test before $0" 1>&2
> exit 77
> Index: tests/mdemo-shared.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/mdemo-shared.test,v
> retrieving revision 1.6
> diff -p -u -3 -r1.6 mdemo-shared.test
> --- tests/mdemo-shared.test 19 Nov 2002 09:42:39 -0000 1.6
> +++ tests/mdemo-shared.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../mdemo (prefix=$prefix) with --disable-static"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure
> --srcdir=$srcdir/../mdemo --prefix=$prefix --disable-static || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo
> --prefix=$prefix --disable-static || exit 1
>
> if grep '^build_old_libs=no' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/mdemo-static.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/mdemo-static.test,v
> retrieving revision 1.6
> diff -p -u -3 -r1.6 mdemo-static.test
> --- tests/mdemo-static.test 19 Nov 2002 09:42:39 -0000 1.6
> +++ tests/mdemo-static.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../mdemo (prefix=$prefix) with --disable-shared"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure
> --srcdir=$srcdir/../mdemo --prefix=$prefix --disable-shared || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo
> --prefix=$prefix --disable-shared || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=no' libtool > /dev/null; then :
> Index: tests/pdemo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/pdemo-conf.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 pdemo-conf.test
> --- tests/pdemo-conf.test 19 Nov 2002 09:42:39 -0000 1.4
> +++ tests/pdemo-conf.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../pdemo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh} $srcdir/../pdemo/configure
> --srcdir=$srcdir/../pdemo --prefix=$prefix || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../pdemo/configure --srcdir=$srcdir/../pdemo
> --prefix=$prefix || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/pdemo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/pdemo-exec.test,v
> retrieving revision 1.5
> diff -p -u -3 -r1.5 pdemo-exec.test
> --- tests/pdemo-exec.test 19 Nov 2002 09:42:39 -0000 1.5
> +++ tests/pdemo-exec.test 19 Feb 2003 19:46:25 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../pdemo/hell; then :
> +if test -f ../pdemo/hell$EXEEXT; then :
> else
> echo "You must run pdemo-make.test before running $0" 1>&2
> exit 77
> Index: tests/pdemo-inst.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/pdemo-inst.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 pdemo-inst.test
> --- tests/pdemo-inst.test 19 Nov 2002 09:42:39 -0000 1.4
> +++ tests/pdemo-inst.test 19 Feb 2003 19:46:25 -0000
> @@ -11,7 +11,7 @@ fi
> . $srcdir/defs || exit 1
>
> # Check that things are built.
> -if test -f ../pdemo/hell; then :
> +if test -f ../pdemo/hell$EXEEXT; then :
> else
> echo "You must run pdemo-make.test before $0" 1>&2
> exit 77
> Index: tests/tagdemo-conf.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/tagdemo-conf.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 tagdemo-conf.test
> --- tests/tagdemo-conf.test 19 Nov 2002 09:42:39 -0000 1.4
> +++ tests/tagdemo-conf.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../tagdemo (prefix=$prefix)"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix ||
> exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure
> --srcdir=$srcdir/../tagdemo --prefix=$prefix || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/tagdemo-exec.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/tagdemo-exec.test,v
> retrieving revision 1.2
> diff -p -u -3 -r1.2 tagdemo-exec.test
> --- tests/tagdemo-exec.test 6 Jun 2001 14:53:29 -0000 1.2
> +++ tests/tagdemo-exec.test 19 Feb 2003 19:46:25 -0000
> @@ -10,7 +10,7 @@ if test -z "$srcdir"; then
> fi
> . $srcdir/defs || exit 1
>
> -if test -f ../tagdemo/tagdemo; then :
> +if test -f ../tagdemo/tagdemo$EXEEXT; then :
> else
> echo "You must run tagdemo-make.test before running $0" 1>&2
> exit 77
> Index: tests/tagdemo-shared.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/tagdemo-shared.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 tagdemo-shared.test
> --- tests/tagdemo-shared.test 19 Nov 2002 09:42:39 -0000 1.4
> +++ tests/tagdemo-shared.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../tagdemo (prefix=$prefix) with --disable-static"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix
> --disable-static || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure
> --srcdir=$srcdir/../tagdemo --prefix=$prefix --disable-static || exit 1
>
> if grep '^build_old_libs=no' libtool > /dev/null &&
> grep '^build_libtool_libs=yes' libtool > /dev/null; then :
> Index: tests/tagdemo-static.test
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/tests/tagdemo-static.test,v
> retrieving revision 1.4
> diff -p -u -3 -r1.4 tagdemo-static.test
> --- tests/tagdemo-static.test 19 Nov 2002 09:42:39 -0000 1.4
> +++ tests/tagdemo-static.test 19 Feb 2003 19:46:25 -0000
> @@ -25,7 +25,7 @@ rm -f config.cache
>
> # Configure the demonstration.
> echo "= Configuring in ../tagdemo (prefix=$prefix) with --disable-shared"
> -CONFIG_SITE=/nonexistent ${CONFIG_SHELL-/bin/sh}
> $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix
> --disable-shared || exit 1
> +${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure
> --srcdir=$srcdir/../tagdemo --prefix=$prefix --disable-shared || exit 1
>
> if grep '^build_old_libs=yes' libtool > /dev/null &&
> grep '^build_libtool_libs=no' libtool > /dev/null; then :
>
> _______________________________________________
> Libtool-patches mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/libtool-patches
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: CONF_SUBDIRS in Makefile.am; test suite & DJGPP [PATCH],
Robert Boehne <=