From: Alexandre Oliva <aoliva@redhat.com>
Date: Mon, 4 Sep 2000 07:45:56 +0000 (+0000)
Subject: * tests/*.test (CONFIG_SITE): Ultrix's /bin/sh fails on
X-Git-Tag: multi-language-merge-point~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=347acbf9d318a4d86fd63c84c0042bd4d20d493c;p=thirdparty%2Flibtool.git

* tests/*.test (CONFIG_SITE): Ultrix's /bin/sh fails on
`. /dev/null'.  Set CONFIG_SITE to /dev/null/config/site, to make
sure we pick a non-existent file.
---

diff --git a/ChangeLog b/ChangeLog
index a3f6661a5..136f0549b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-09-04  Alexandre Oliva  <aoliva@redhat.com>
 
+	* tests/*.test (CONFIG_SITE): Ultrix's /bin/sh fails on
+	`. /dev/null'.  Set CONFIG_SITE to /dev/null/config/site, to make
+	sure we pick a non-existent file.
+
 	* ltcf-c.sh, ltcf-gcj.sh (hardcode_libdir_flag_spec,
 	export_dynamic_flag_spec): Use ${wl}, not ${wlarc}.
 
diff --git a/tests/cdemo-conf.test b/tests/cdemo-conf.test
index c6d0d161b..ac5689cad 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --prefix=$prefix || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --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/cdemo-shared.test b/tests/cdemo-shared.test
index 004baa9ac..646dcdaee 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --prefix=$prefix --disable-static || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --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/cdemo-static.test b/tests/cdemo-static.test
index 67eca2e24..1a40259c7 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --prefix=$prefix --disable-shared || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../cdemo/configure --srcdir=$srcdir/../cdemo --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/demo-conf.test b/tests/demo-conf.test
index edb77091c..f8c58f186 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --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/demo-nofast.test b/tests/demo-nofast.test
index 0115a81b2..450e9fe95 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --enable-fast-install=no || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --enable-fast-install=no || exit 1
 
 if egrep '^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 9c4e60e6b..aea98c854 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --with-pic=no || exit 1
+CONFIG_SITE=/dev/null/config/site ${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 9a4224f27..79c637dac 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --with-pic=yes || exit 1
+CONFIG_SITE=/dev/null/config/site ${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 d3f3c987e..4832be8a2 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --disable-static || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --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/demo-static.test b/tests/demo-static.test
index f7e015891..81c2a1436 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --disable-shared || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --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/depdemo-conf.test b/tests/depdemo-conf.test
index 750b75a14..0f55e4374 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --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/depdemo-nofast.test b/tests/depdemo-nofast.test
index 606f34186..04b3a4b17 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --enable-fast-install=no || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --enable-fast-install=no || exit 1
 
 if egrep '^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 a5503366b..cd4e72e0b 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --disable-static || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --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/depdemo-static.test b/tests/depdemo-static.test
index e2c982ab3..ca167b462 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --disable-shared || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --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 aa05fed83..17a3c2d14 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --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/mdemo-shared.test b/tests/mdemo-shared.test
index 3cbc2ffb3..6878275ba 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix --disable-static || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --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/mdemo-static.test b/tests/mdemo-static.test
index c6f5562f4..da3aa7697 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --prefix=$prefix --disable-shared || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../mdemo/configure --srcdir=$srcdir/../mdemo --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/tagdemo-conf.test b/tests/tagdemo-conf.test
index 3f7135f13..572e6e8c2 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --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/tagdemo-shared.test b/tests/tagdemo-shared.test
index 0a738a633..46152263d 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix --disable-static || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --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/tagdemo-static.test b/tests/tagdemo-static.test
index 13b03c34f..9a5bcefe7 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=/dev/null ${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix --disable-shared || exit 1
+CONFIG_SITE=/dev/null/config/site ${CONFIG_SHELL-/bin/sh} $srcdir/../tagdemo/configure --srcdir=$srcdir/../tagdemo --prefix=$prefix --disable-shared || exit 1
 
 if egrep '^build_old_libs=yes' libtool > /dev/null &&
    egrep '^build_libtool_libs=no' libtool > /dev/null; then :