* 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.
This commit is contained in:
Richard Dawe 2003-03-29 05:06:46 +00:00 committed by Robert Boehne
parent eeb3d9cc7c
commit b9f8f1036e
37 changed files with 67 additions and 34 deletions

View File

@ -1,3 +1,29 @@
2003-03-28 Richard Dawe <rich@phekda.freeserve.co.uk>
* 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-03-28 Peter O'Gorman <peter@pogma.com>
* libltdl/ltdl.c (dyld): Remove some debug printf's, fix a bug.

View File

@ -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)

View File

@ -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 :

View File

@ -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

View File

@ -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 :

View File

@ -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 :

View File

@ -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 | "")

View File

@ -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 :

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 :

View File

@ -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 :

View File

@ -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 :

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 :

View File

@ -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 :

View File

@ -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 :

View File

@ -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

View File

@ -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 :

View File

@ -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 :

View File

@ -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 :

View File

@ -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

View File

@ -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

View File

@ -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 :

View File

@ -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 :

View File

@ -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 :

View File

@ -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

View File

@ -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

View File

@ -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 :

View File

@ -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

View File

@ -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 :

View File

@ -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 :