From: Richard Dawe <rich@phekda.freeserve.co.uk>
Date: Sat, 29 Mar 2003 05:06:46 +0000 (+0000)
Subject: * Makefile.am: Define CONF_SUBDIRS.
X-Git-Tag: release-1-5~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9f8f1036e98766c068a51cb84d16f67247fa9c8;p=thirdparty%2Flibtool.git

* 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.
---

diff --git a/ChangeLog b/ChangeLog
index 346f995c5..c88120aa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makefile.am b/Makefile.am
index 5f74d9c7d..e4228012c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)
 
diff --git a/tests/cdemo-conf.test b/tests/cdemo-conf.test
index 27b49fb3a..be65b7691 100755
--- a/tests/cdemo-conf.test
+++ b/tests/cdemo-conf.test
@@ -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 :
diff --git a/tests/cdemo-exec.test b/tests/cdemo-exec.test
index b7e5afaf0..f558fdc23 100755
--- a/tests/cdemo-exec.test
+++ b/tests/cdemo-exec.test
@@ -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
diff --git a/tests/cdemo-shared.test b/tests/cdemo-shared.test
index b3d4a4706..3b38df30e 100755
--- a/tests/cdemo-shared.test
+++ b/tests/cdemo-shared.test
@@ -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 :
diff --git a/tests/cdemo-static.test b/tests/cdemo-static.test
index 225796bb6..e81b40651 100755
--- a/tests/cdemo-static.test
+++ b/tests/cdemo-static.test
@@ -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 :
diff --git a/tests/defs b/tests/defs
index d8a29e748..2439846e0 100644
--- a/tests/defs
+++ b/tests/defs
@@ -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 | "")
diff --git a/tests/demo-conf.test b/tests/demo-conf.test
index 689732c2a..5f8daf404 100755
--- a/tests/demo-conf.test
+++ b/tests/demo-conf.test
@@ -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 :
diff --git a/tests/demo-exec.test b/tests/demo-exec.test
index cd0ff2f4f..9402f443c 100755
--- a/tests/demo-exec.test
+++ b/tests/demo-exec.test
@@ -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
diff --git a/tests/demo-inst.test b/tests/demo-inst.test
index 678fa6e35..9e38d9d0e 100755
--- a/tests/demo-inst.test
+++ b/tests/demo-inst.test
@@ -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
diff --git a/tests/demo-nofast.test b/tests/demo-nofast.test
index 79ec2b16a..0e1d8ae1e 100755
--- a/tests/demo-nofast.test
+++ b/tests/demo-nofast.test
@@ -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
diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test
index 5773736b5..69e995388 100755
--- a/tests/demo-nopic.test
+++ b/tests/demo-nopic.test
@@ -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
diff --git a/tests/demo-pic.test b/tests/demo-pic.test
index 794295cc5..f3ddb3b73 100755
--- a/tests/demo-pic.test
+++ b/tests/demo-pic.test
@@ -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
diff --git a/tests/demo-shared.test b/tests/demo-shared.test
index c2425838a..ce80a38d5 100755
--- a/tests/demo-shared.test
+++ b/tests/demo-shared.test
@@ -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 :
diff --git a/tests/demo-static.test b/tests/demo-static.test
index 442cce770..9672c390d 100755
--- a/tests/demo-static.test
+++ b/tests/demo-static.test
@@ -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 :
diff --git a/tests/depdemo-conf.test b/tests/depdemo-conf.test
index 97e3e50d0..927546637 100755
--- a/tests/depdemo-conf.test
+++ b/tests/depdemo-conf.test
@@ -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 :
diff --git a/tests/depdemo-exec.test b/tests/depdemo-exec.test
index dabc06e51..b299c4cb6 100755
--- a/tests/depdemo-exec.test
+++ b/tests/depdemo-exec.test
@@ -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
diff --git a/tests/depdemo-inst.test b/tests/depdemo-inst.test
index 7a379cfa8..85c73b3fc 100755
--- a/tests/depdemo-inst.test
+++ b/tests/depdemo-inst.test
@@ -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
diff --git a/tests/depdemo-nofast.test b/tests/depdemo-nofast.test
index 861b9e05f..a8f4861de 100755
--- a/tests/depdemo-nofast.test
+++ b/tests/depdemo-nofast.test
@@ -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
diff --git a/tests/depdemo-shared.test b/tests/depdemo-shared.test
index b2228e7f4..d4e593eee 100755
--- a/tests/depdemo-shared.test
+++ b/tests/depdemo-shared.test
@@ -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 :
diff --git a/tests/depdemo-static.test b/tests/depdemo-static.test
index 24a187098..e889822d3 100755
--- a/tests/depdemo-static.test
+++ b/tests/depdemo-static.test
@@ -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 :
diff --git a/tests/f77demo-conf.test b/tests/f77demo-conf.test
index 891b8df35..23d7af7b7 100755
--- a/tests/f77demo-conf.test
+++ b/tests/f77demo-conf.test
@@ -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 :
diff --git a/tests/f77demo-exec.test b/tests/f77demo-exec.test
index 5faa07de9..ac6b85348 100755
--- a/tests/f77demo-exec.test
+++ b/tests/f77demo-exec.test
@@ -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
diff --git a/tests/f77demo-shared.test b/tests/f77demo-shared.test
index 6363ac929..a54eeec83 100755
--- a/tests/f77demo-shared.test
+++ b/tests/f77demo-shared.test
@@ -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 :
diff --git a/tests/f77demo-static.test b/tests/f77demo-static.test
index 2f145cdc0..3e710366d 100755
--- a/tests/f77demo-static.test
+++ b/tests/f77demo-static.test
@@ -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 :
diff --git a/tests/mdemo-conf.test b/tests/mdemo-conf.test
index 39ef1c9c5..acfe747dc 100755
--- a/tests/mdemo-conf.test
+++ b/tests/mdemo-conf.test
@@ -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 :
diff --git a/tests/mdemo-exec.test b/tests/mdemo-exec.test
index c0969b549..26834b3df 100755
--- a/tests/mdemo-exec.test
+++ b/tests/mdemo-exec.test
@@ -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
diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test
index 7c9ea38c7..2e02e2c64 100755
--- a/tests/mdemo-inst.test
+++ b/tests/mdemo-inst.test
@@ -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
diff --git a/tests/mdemo-shared.test b/tests/mdemo-shared.test
index 9ece0f9aa..b23a2348f 100755
--- a/tests/mdemo-shared.test
+++ b/tests/mdemo-shared.test
@@ -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 :
diff --git a/tests/mdemo-static.test b/tests/mdemo-static.test
index e17268d7d..6e0292292 100755
--- a/tests/mdemo-static.test
+++ b/tests/mdemo-static.test
@@ -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 :
diff --git a/tests/pdemo-conf.test b/tests/pdemo-conf.test
index 67662b656..655b81831 100755
--- a/tests/pdemo-conf.test
+++ b/tests/pdemo-conf.test
@@ -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 :
diff --git a/tests/pdemo-exec.test b/tests/pdemo-exec.test
index 9b03fe5af..64d129c16 100755
--- a/tests/pdemo-exec.test
+++ b/tests/pdemo-exec.test
@@ -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
diff --git a/tests/pdemo-inst.test b/tests/pdemo-inst.test
index d7cec5398..9310356e9 100755
--- a/tests/pdemo-inst.test
+++ b/tests/pdemo-inst.test
@@ -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
diff --git a/tests/tagdemo-conf.test b/tests/tagdemo-conf.test
index fc40052da..06edb6ef8 100755
--- a/tests/tagdemo-conf.test
+++ b/tests/tagdemo-conf.test
@@ -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 :
diff --git a/tests/tagdemo-exec.test b/tests/tagdemo-exec.test
index 21db056df..a72636e5e 100755
--- a/tests/tagdemo-exec.test
+++ b/tests/tagdemo-exec.test
@@ -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
diff --git a/tests/tagdemo-shared.test b/tests/tagdemo-shared.test
index d464bbc55..46c06992b 100755
--- a/tests/tagdemo-shared.test
+++ b/tests/tagdemo-shared.test
@@ -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 :
diff --git a/tests/tagdemo-static.test b/tests/tagdemo-static.test
index 792cb2917..9f6d85606 100755
--- a/tests/tagdemo-static.test
+++ b/tests/tagdemo-static.test
@@ -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 :