Ensure CONFIG_SHELL is not empty before relying on it for #! scripts.

bk: 4d67a26avXETIw9DeIPUECiaZgWYMA

diff --git a/ChangeLog b/ChangeLog
index b25c31dbec590963c68d0178a0200969da07794f..06847d1730b83cae26829859ff07783134651fae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Ensure CONFIG_SHELL is not empty before relying on it for #! scripts.
 (4.2.7p134) 2011/02/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1837] Build fails on Win7 due to regedit requiring privilege.
 * Provide fallback definitions for GetAdaptersAddresses() for Windows

diff --git a/configure.ac b/configure.ac
index 258639c74b5f027c5877a2b32d4da6de04eace97..f8da73100fddd4dd934d03079d9766554b0985cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,7 @@ dnl  the caching after the tests so preset overrides still work.
 AS_UNSET([ac_cv_path_PATH_PERL])
 AC_PATH_PROG([PATH_TEST], [test])
 AS_UNSET([ac_cv_path_PATH_TEST])
+test -z "$CONFIG_SHELL" && CONFIG_SHELL=/bin/sh
 AC_SUBST([CONFIG_SHELL])               dnl for scripts #!/path/to/sh
 
 AC_ARG_WITH(