From 4dbacffe7bd6160c66c89093969eba469fb90b55 Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Wed, 1 Jun 2005 20:09:28 -0700
Subject:  - (tim) [configure.ac] set TEST_SHELL for OpenServer 6

---
 ChangeLog    | 3 ++-
 configure.ac | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ef54244a..67d44780c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
      fix -O for cases where no ControlPath has been specified or socket at
      ControlPath is not contactable; spotted by and ok avsm@
  - (tim) [config.guess config.sub] Update to '2005-05-27' version.
+ - (tim) [configure.ac] set TEST_SHELL for OpenServer 6
 
 20050531
  - (dtucker) [contrib/aix/pam.conf] Correct comments.  From davidl at
@@ -2666,4 +2667,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.3808 2005/06/02 02:57:45 tim Exp $
+$Id: ChangeLog,v 1.3809 2005/06/02 03:09:28 tim Exp $
diff --git a/configure.ac b/configure.ac
index e94663790..61132acd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.270 2005/06/01 11:39:33 dtucker Exp $
+# $Id: configure.ac,v 1.271 2005/06/02 03:09:28 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -371,6 +371,11 @@ mips-sony-bsd|mips-sony-newsos4)
 	AC_DEFINE(BROKEN_SETREUID)
 	AC_DEFINE(BROKEN_SETREGID)
 	AC_DEFINE(PASSWD_NEEDS_USERNAME, 1, [must supply username to passwd])
+	case "$host" in
+	*-*-sysv5SCO_SV*)	# SCO OpenServer 6.x
+		TEST_SHELL=/u95/bin/sh
+		;;
+	esac
 	;;
 *-*-sysv*)
 	;;
-- 
cgit v1.2.3