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

diff --git a/ChangeLog b/ChangeLog
index 97c7cf7944e45f4c0e1863dd535bc12ff1803a55..bd75a55f3be85a64f1567f4eb852b91b79c588f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 20020903
+ - (djm) Patch from itojun@ for Darwin OS: test getaddrinfo, reorder libcrypt
  - (djm) Fix Redhat RPM build dependancy test
  - (djm) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2002/08/12 10:46:35

diff --git a/configure.ac b/configure.ac
index ff988198780bd91d8bd36f6246c2b27eebf83093..0f0d24412885fd832fe54d9b1ef7693f16f0b045 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,16 @@ case "$host" in
        AC_DEFINE(IP_TOS_IS_BROKEN)
        ;;
 *-*-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)
        if test -z "$GCC"; then
@@ -175,6 +184,7 @@ mips-sony-bsd|mips-sony-newsos4)
        SONY=1
        ;;
 *-*-netbsd*)
+       check_for_libcrypt_before=1
        need_dash_r=1
        ;;
 *-*-freebsd*)
@@ -718,6 +728,12 @@ 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"