- (tim) [configure.ac] Move check_for_libcrypt_later=1 in *-*-sysv5*) section.

   OpenServer 6 doesn't need libcrypt.

2 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d7c7c538..04a70ed5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (tim) [configure.ac defines.h openbsd-compat/port-uw.c
    openbsd-compat/xcrypt.c] Add SECUREWARE support to OpenServer 6 SVR5 ABI.
    OK djm@ dtucker@
+ - (tim) [configure.ac] Move check_for_libcrypt_later=1 in *-*-sysv5*) section.
+   OpenServer 6 doesn't need libcrypt.
 
 20081209
  - (djm) OpenBSD CVS Sync
@@ -4994,5 +4996,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5156 2009/01/07 18:04:12 tim Exp $
+$Id: ChangeLog,v 1.5157 2009/01/08 04:50:08 tim Exp $
 
diff --git a/configure.ac b/configure.ac
index df834baca..94589ddc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.412 2009/01/07 18:04:12 tim Exp $
+# $Id: configure.ac,v 1.413 2009/01/08 04:50:09 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.412 $)
+AC_REVISION($Revision: 1.413 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -728,7 +728,6 @@ mips-sony-bsd|mips-sony-newsos4)
         ;;
 # UnixWare 7.x, OpenUNIX 8
 *-*-sysv5*)
-        check_for_libcrypt_later=1
         AC_DEFINE(UNIXWARE_LONG_PASSWORDS, 1, [Support passwords > 8 chars])
         AC_DEFINE(USE_PIPES)
         AC_DEFINE(SETEUID_BREAKS_SETUID)
@@ -748,6 +747,7 @@ mips-sony-bsd|mips-sony-newsos4)
                         ],,)
                 ;;
         *)      AC_DEFINE(LOCKED_PASSWD_STRING, "*LK*")
+                check_for_libcrypt_later=1
                 ;;
         esac
         ;;