(tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.

OK dtucker@

diff --git a/ChangeLog b/ChangeLog
index d313db5c59325731a988a4fcd48b2c0072e23a5c..5344d85d178c62f4e0856ed84630fd98cfab45ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20040620
+ - (tim) [configure.ac Makefile.in] Only change TEST_SHELL on broken platforms.
+
 20040619
  - (dtucker) [auth-pam.c] Don't use PAM namespace for
     pam_password_change_required either.

diff --git a/Makefile.in b/Makefile.in
index 61cedc975de716c2bcd3cacd66ac8c52d0b91ce5..a5cb8a58ccfb010efafd5e42d175874b3c50e582 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -377,7 +377,7 @@ tests:      $(TARGETS)
        [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress; \
        [ -f `pwd`/regress/Makefile ]  || \
            ln -s $(srcdir)/regress/Makefile `pwd`/regress/Makefile ; \
-       TEST_SHELL="@TEST_MINUS_S_SH@"; \
+       TEST_SHELL="@TEST_SHELL@"; \
        TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
        TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
        TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \

diff --git a/configure.ac b/configure.ac
index a4ca8b51e5f3b5459cabc6c1431923d480a155be..af9188d458ff34fc2c19739c721097e194a13411 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_PATH_PROG(TEST_MINUS_S_SH, bash)
 AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
 AC_PATH_PROG(TEST_MINUS_S_SH, sh)
 AC_PATH_PROG(SH, sh)
+AC_SUBST(TEST_SHELL,sh)
 
 dnl for buildpkg.sh
 AC_PATH_PROG(PATH_GROUPADD_PROG, groupadd, groupadd,
@@ -375,6 +376,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_CHECK_FUNCS(getluid setluid)
        MANTYPE=man
        do_sco3_extra_lib_check=yes
+       TEST_SHELL=ksh
        ;;
 *-*-sco3.2v5*)
        if test -z "$GCC"; then
@@ -392,6 +394,7 @@ mips-sony-bsd|mips-sony-newsos4)
        AC_DEFINE(WITH_ABBREV_NO_TTY)
        AC_CHECK_FUNCS(getluid setluid)
        MANTYPE=man
+       TEST_SHELL=ksh
        ;;
 *-*-unicosmk*)
        AC_DEFINE(NO_SSH_LASTLOG)