2008-03-23 Tollef Fog Heen <tfheen@err.no>

	* check/check-cflags, check/check-define-variable,
	check/check-includedir, check/check-libs,
	check/check-libs-private, check/check-requires-private: Replace
	the crazy -d ~root check with a more proper way to just make sure
	we are running under a POSIX shell.  Thanks to Kjetil Torgrim
	Homme for the tip about using getconf PATH.

diff --git a/ChangeLog b/ChangeLog
index ab22df0af865a9999acd013b36cc2eeb2f06a106..18d3f6ad862cf740da709f214375ab2eb6ec5966 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-03-23  Tollef Fog Heen  <tfheen@err.no>
 
+       * check/check-cflags, check/check-define-variable,
+       check/check-includedir, check/check-libs,
+       check/check-libs-private, check/check-requires-private: Replace
+       the crazy -d ~root check with a more proper way to just make sure
+       we are running under a POSIX shell.  Thanks to Kjetil Torgrim
+       Homme for the tip about using getconf PATH.
+
        * main.c (main): Add logging support from NetBSD.  Thanks to Julio
        M. Merino Vidal for forwarding the patch from ages ago.
 

diff --git a/check/check-cflags b/check/check-cflags
index d561b92d03352c1518dedaf1a8f057034e7015d4..9d517c8852c483af5e45fd47dfa924366aa29348 100755 (executable)
--- a/check/check-cflags
+++ b/check/check-cflags
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-# Do the Solaris Dance:
-if [ ! -d ~root ]  ; then
-    exec /usr/xpg4/bin/sh $0 "$@" 
+# Make sure we're POSIX
+if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+    PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
 fi
 
 set -e

diff --git a/check/check-define-variable b/check/check-define-variable
index dd7f3238134155682d2a11b629d3963a6bf4cdf6..bf8aebefdcea2a960c315df7289337ea97271c84 100755 (executable)
--- a/check/check-define-variable
+++ b/check/check-define-variable
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-# Do the Solaris Dance:
-if [ ! -d ~root ]  ; then
-    exec /usr/xpg4/bin/sh $0 "$@" 
+# Make sure we're POSIX
+if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+    PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
 fi
 
 set -e

diff --git a/check/check-includedir b/check/check-includedir
index e4c234c31ba15a01a667729f82755fe181321de4..d78ec2433f6c084adcf5f01f3301503cb2ac982a 100755 (executable)
--- a/check/check-includedir
+++ b/check/check-includedir
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-# Do the Solaris Dance:
-if [ ! -d ~root ]  ; then
-    exec /usr/xpg4/bin/sh $0 "$@"
+# Make sure we're POSIX
+if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+    PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
 fi
 
 set -e

diff --git a/check/check-libs b/check/check-libs
index ce878a6e3ff6a76ff3075202becedbcf7df110d2..32366a1bd4bd4e78d6e3425dd4dcf25483c0d060 100755 (executable)
--- a/check/check-libs
+++ b/check/check-libs
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-# Do the Solaris Dance:
-if [ ! -d ~root ]  ; then
-    exec /usr/xpg4/bin/sh $0 "$@" 
+# Make sure we're POSIX
+if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+    PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
 fi
 
 set -e

diff --git a/check/check-libs-private b/check/check-libs-private
index 4e83c85e3c5f50b3d926cf395598d3dca588fb26..961962b4312b8307c063cd8607c08c18fc30f851 100755 (executable)
--- a/check/check-libs-private
+++ b/check/check-libs-private
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-# Do the Solaris Dance:
-if [ ! -d ~root ]  ; then
-    exec /usr/xpg4/bin/sh $0 "$@" 
+# Make sure we're POSIX
+if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+    PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
 fi
 
 set -e

diff --git a/check/check-requires-private b/check/check-requires-private
index 7d0f9a9642a668ab8363541d13614e2b51910889..0f02fb4aaaca78134d0a7881c76f97d35167959b 100755 (executable)
--- a/check/check-requires-private
+++ b/check/check-requires-private
@@ -1,10 +1,9 @@
 #! /bin/sh
 
-# Do the Solaris Dance:
-if [ ! -d ~root ]  ; then
-    exec /usr/xpg4/bin/sh $0 "$@" 
+# Make sure we're POSIX
+if [ "$PKG_CONFIG_SHELL_IS_POSIX" != "1" ]; then
+    PKG_CONFIG_SHELL_IS_POSIX=1 PATH=`getconf PATH` exec sh $0 "$@"
 fi
-
 set -e
 
 . ${srcdir}/common