tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 15:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt

Browse Source
This commit is contained in:
Damien Miller 2002-09-04 23:26:29 +10:00
parent 6b09792a55
commit fc93d4bd31
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,4 +1,5 @@
20020903 20020903
- (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt
- (djm) Fix Redhat RPM build dependancy test - (djm) Fix Redhat RPM build dependancy test
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/08/12 10:46:35 - markus@cvs.openbsd.org 2002/08/12 10:46:35
@ -1596,4 +1597,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2443 2002/09/04 07:19:04 djm Exp $ $Id: ChangeLog,v 1.2444 2002/09/04 13:26:29 djm Exp $

20
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.85 2002/08/14 01:52:11 tim Exp $ # $Id: configure.ac,v 1.86 2002/09/04 13:26:30 djm Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -98,7 +98,16 @@ case "$host" in
AC_DEFINE(IP_TOS_IS_BROKEN) AC_DEFINE(IP_TOS_IS_BROKEN)
;; ;;
*-*-darwin*) *-*-darwin*)
AC_DEFINE(BROKEN_GETADDRINFO) AC_MSG_CHECKING(if we have working getaddrinfo)
AC_TRY_RUN([#include <mach-o/dyld.h>
main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
exit(0);
else
exit(1);
}], [AC_MSG_RESULT(working)],
[AC_MSG_RESULT(buggy)
AC_DEFINE(BROKEN_GETADDRINFO)],
[AC_MSG_RESULT(assume it is working)])
;; ;;
*-*-hpux10.26) *-*-hpux10.26)
if test -z "$GCC"; then if test -z "$GCC"; then
@ -175,6 +184,7 @@ mips-sony-bsd|mips-sony-newsos4)
SONY=1 SONY=1
;; ;;
*-*-netbsd*) *-*-netbsd*)
check_for_libcrypt_before=1
need_dash_r=1 need_dash_r=1
;; ;;
*-*-freebsd*) *-*-freebsd*)
@ -718,6 +728,12 @@ if test "x$PAM_MSG" = "xyes" ; then
) )
fi 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 # Search for OpenSSL
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
saved_LDFLAGS="$LDFLAGS" saved_LDFLAGS="$LDFLAGS"