[configure.ac] Make sure -lcrypto is before -lsocket for sco3. ok mouring@
This commit is contained in:
parent
9ad7e0e805
commit
3d5352e156
|
@ -2,6 +2,8 @@
|
|||
- (tim) [Makefile.in regress/sftp-badcmds.sh regress/test-exec.sh]
|
||||
Portablity fixes. Data sftp transfers needs to be world readable. Some
|
||||
older shells hang on while loops when doing sh -n some_script. OK dtucker@
|
||||
- (tim) [configure.ac] Make sure -lcrypto is before -lsocket for sco3.
|
||||
ok mouring@
|
||||
|
||||
20040211
|
||||
- (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
|
||||
|
@ -1850,4 +1852,4 @@
|
|||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
||||
|
||||
$Id: ChangeLog,v 1.3227 2004/02/12 15:17:10 tim Exp $
|
||||
$Id: ChangeLog,v 1.3228 2004/02/12 17:27:21 tim Exp $
|
||||
|
|
16
configure.ac
16
configure.ac
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.197 2004/02/11 22:46:40 tim Exp $
|
||||
# $Id: configure.ac,v 1.198 2004/02/12 17:27:21 tim Exp $
|
||||
|
||||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([ssh.c])
|
||||
|
@ -1021,12 +1021,6 @@ if test "x$PAM_MSG" = "xyes" ; then
|
|||
)
|
||||
fi
|
||||
|
||||
# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
|
||||
# because the system crypt() is more featureful.
|
||||
if test "x$check_for_libcrypt_before" = "x1"; then
|
||||
AC_CHECK_LIB(crypt, crypt)
|
||||
fi
|
||||
|
||||
# Search for OpenSSL
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
saved_LDFLAGS="$LDFLAGS"
|
||||
|
@ -1055,7 +1049,7 @@ AC_ARG_WITH(ssl-dir,
|
|||
fi
|
||||
]
|
||||
)
|
||||
LIBS="$LIBS -lcrypto"
|
||||
LIBS="-lcrypto $LIBS"
|
||||
AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
|
||||
[
|
||||
dnl Check default openssl install dir
|
||||
|
@ -1157,6 +1151,12 @@ Also see contrib/findssl.sh for help identifying header/library mismatches.])
|
|||
]
|
||||
)
|
||||
|
||||
# Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
|
||||
# because the system crypt() is more featureful.
|
||||
if test "x$check_for_libcrypt_before" = "x1"; then
|
||||
AC_CHECK_LIB(crypt, crypt)
|
||||
fi
|
||||
|
||||
# Some Linux systems (Slackware) need crypt() from libcrypt, *not* the
|
||||
# version in OpenSSL.
|
||||
if test "x$check_for_libcrypt_later" = "x1"; then
|
||||
|
|
Loading…
Reference in New Issue