1 files changed, 6 insertions, 4 deletions

diff --git a/configure.ac b/configure.ac
index d6c57864c..b8a610d5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.530 2013/06/02 16:03:26 dtucker Exp $
+# $Id: configure.ac,v 1.531 2013/06/02 21:05:49 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.530 $)
+AC_REVISION($Revision: 1.531 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -812,6 +812,7 @@ mips-sony-bsd|mips-sony-newsos4)
                         SP_MSG="yes" ], )
                 ],
         )
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         ;;
 *-*-sunos4*)
         CPPFLAGS="$CPPFLAGS -DSUNOS4"
@@ -855,6 +856,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([BROKEN_SETREGID])
         AC_DEFINE([PASSWD_NEEDS_USERNAME], [1], [must supply username to passwd])
         AC_DEFINE([LOCKED_PASSWD_STRING], ["*LK*"])
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
@@ -866,10 +868,10 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([BROKEN_SETREUID])
         AC_DEFINE([BROKEN_SETREGID])
         AC_DEFINE([PASSWD_NEEDS_USERNAME])
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         case "$host" in
         *-*-sysv5SCO_SV*)       # SCO OpenServer 6.x
                 maildir=/var/spool/mail
-                TEST_SHELL=/u95/bin/sh
                 AC_DEFINE([BROKEN_LIBIAF], [1],
                         [ia_uinfo routines not supported by OS yet])
                 AC_DEFINE([BROKEN_UPDWTMPX])
@@ -910,7 +912,7 @@ mips-sony-bsd|mips-sony-newsos4)
         AC_DEFINE([PASSWD_NEEDS_USERNAME])
         AC_CHECK_FUNCS([getluid setluid])
         MANTYPE=man
-        TEST_SHELL=ksh
+        TEST_SHELL=$SHELL       # let configure find us a capable shell
         SKIP_DISABLE_LASTLOG_DEFINE=yes
         ;;
 *-*-unicosmk*)