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

OK dtucker@

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d5275dd9..73a7a1d2c 100644
--- 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.
@@ -1316,4 +1319,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3416 2004/06/20 02:31:06 tim Exp $
+$Id: ChangeLog,v 1.3417 2004/06/20 17:37:32 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index a813d1747..3e1bbcaa8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.259 2004/06/15 00:44:40 djm Exp $
+# $Id: Makefile.in,v 1.260 2004/06/20 17:37:33 tim Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -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 4b49c935b..88c0c4687 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.220 2004/06/20 02:31:06 tim Exp $
+# $Id: configure.ac,v 1.221 2004/06/20 17:37:32 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -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)