* 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 346f995c5825e15db79c7adc9228c51b829230be..c88120aa6d5a0fc27746b4a9b107fe6b20003896 100644 (file)
--- 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 5f74d9c7dfcebfd99481c6bb5954a29d120782fe..e4228012c1c0373662a3d99043917e7922ed2269 100644 (file)
--- 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 27b49fb3a15fa4c50816772c71ebcbd2006784c0..be65b76915fe02b824cdc60811582aece964718d 100755 (executable)
--- 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 b7e5afaf0e466e1ca17bf587af7d0940fa788c2f..f558fdc23aa1ea15fe3901dd28abaa548c7127ba 100755 (executable)
--- 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 b3d4a4706166ffff10a1e2889bdfa4aac692f39e..3b38df30e0f64b06269e4ed812270c7bfe4f8b4b 100755 (executable)
--- 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 225796bb604c7ac86bc37048e5db881501a66cd6..e81b40651d62454b45cf84ac44fbd41cdd9f621e 100755 (executable)
--- 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 d8a29e748789714deb2054629a9d7f55744204c8..2439846e0d7d120b8ed583cb90ecb785eccd6659 100644 (file)
--- 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 689732c2afe2d44dd705450ab038844a8c8cf646..5f8daf404cd8b83c6c5bbcfef5b4db2fc36e2aaa 100755 (executable)
--- 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 cd0ff2f4f2f7f3de86cad1fdec01deda09889417..9402f443c8d1d2b50a5864ba15f0a00b3c7f5c88 100755 (executable)
--- 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 678fa6e35a15b1647b2674b550280291ccfb8a60..9e38d9d0e9f6c599bd3d95ced4c6b9a624fd2718 100755 (executable)
--- 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 79ec2b16a65db2f63766671c3050ff5ed7e21ff1..0e1d8ae1e60c816d2551541438c1ec81e2f6d201 100755 (executable)
--- 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 5773736b5dc930f43245ec4dc53ba7b536124f01..69e995388130cc85b58190c84eca8f0dc5226b67 100755 (executable)
--- 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 794295cc503a60f7dbe27cd0d116659f07b4ef2a..f3ddb3b736fad8ed34be1e9185ae31ec6c52b400 100755 (executable)
--- 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 c2425838a8b55d378226877da3721e1fc0e0cb84..ce80a38d5292973350e95ddbc9ac1390057a01af 100755 (executable)
--- 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 442cce77082347ffedf8e3374c4804d514e7d408..9672c390dce732bdaa015a72c699935ee50cbc8b 100755 (executable)
--- 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 97e3e50d0b9d8e94c8a47d7515928f9d0c2e1ed1..92754663728e48112f544e93e5e02719fa9e4b05 100755 (executable)
--- 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 dabc06e511439103259a1445328411e2fdec6fcf..b299c4cb67604de10b15f0ec3fee0c365aee9033 100755 (executable)
--- 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 7a379cfa8caea4bf6ad3d150066ab776f32b45c1..85c73b3fc483c7feaa199938a3e2f964fc772b4b 100755 (executable)
--- 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 861b9e05f4f6d1d7e653f6988611f1aac5563589..a8f4861ded55328788937ca81e12af3c777e2ad1 100755 (executable)
--- 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 b2228e7f4e81edbbd6a51fd5f7e76b1537455c58..d4e593eee50c43edd45f6f927aba64611b005a12 100755 (executable)
--- 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 24a187098f4a4e7585e3345a3d8132ee97d4cae2..e889822d38e936f6e0f6d5efbce811a7ea3e1a9b 100755 (executable)
--- 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 891b8df35f2b5532da42bad6499937ce351fa949..23d7af7b7dd851a7ec548815a2e448d0c1551667 100755 (executable)
--- 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 5faa07de9ea842132dacb53a434e543af87845d5..ac6b85348c93d399188b1c11f60e3f3b65cbc06f 100755 (executable)
--- 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 6363ac929cef7c5215984f7129e63fc8521bf4bc..a54eeec831a8f0c1cd5e427e91a45c31dc0ba8e1 100755 (executable)
--- 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 2f145cdc00174277867125439be68f550dd5006f..3e710366dee81b95801c5e41aa849bb46edbd5ca 100755 (executable)
--- 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 39ef1c9c5e9c91d2e9022c49b12bff9cf62778b4..acfe747dc651b1eee53e5134f73550f469fd1b00 100755 (executable)
--- 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 c0969b549d662ede9b719b464469eabf401521c8..26834b3dfa242203c0afec7f195bc87982aac718 100755 (executable)
--- 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 7c9ea38c7f2fd79f05b2da6db7076891f3394441..2e02e2c64fbcccf286978915cad3c327ff9b5b4d 100755 (executable)
--- 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 9ece0f9aa056b5e29f36ae2c020403c6799be2c8..b23a2348f484b7edd9a5e58ecc659c2c2988c733 100755 (executable)
--- 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 e17268d7d4b8329fd281423c1b0b18175704147e..6e02922929796e1f22b1511459235dc0988db83c 100755 (executable)
--- 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 67662b6566a658e7150ea34945b7134e12805d73..655b81831ec5531ee1b069895505aae444f8d1c1 100755 (executable)
--- 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 9b03fe5af32e59945b6d94dfad180a228a867e00..64d129c16ec58819d869dad1d9565eb90d033905 100755 (executable)
--- 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 d7cec539873838042d157a873a3444a902e56fad..9310356e9053af760d1fa86a67751b892a493f0f 100755 (executable)
--- 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 fc40052da5f6a9e73feaca40b2df292f9b322df0..06edb6ef893a47e2ef43dccb309f99c173a72b68 100755 (executable)
--- 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 21db056dff334b48bf4213ade6b48499b7ce50d1..a72636e5e46fb77ce832400950b3a84de3eada8a 100755 (executable)
--- 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 d464bbc55bc44e948aa5d2fa03e355cfb58797a4..46c06992b3d15dc360569b1c5bfc78eb1f923b54 100755 (executable)
--- 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 792cb2917ab47f30a336520b99b448092d452a78..9f6d85606020745291d8d4aa661568df1341d227 100755 (executable)
--- 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 :