diff --git a/net/nss_ldap/files/patch-configure.in b/net/nss_ldap/files/patch-configure.in index 223ab338eff2..85364c26d5b0 100644 --- a/net/nss_ldap/files/patch-configure.in +++ b/net/nss_ldap/files/patch-configure.in @@ -1,49 +1,48 @@ ---- configure.in.orig 2009-11-06 02:28:08.000000000 -0800 -+++ configure.in 2023-05-09 21:54:34.360457000 -0700 -@@ -97,11 +97,15 @@ +--- configure.in.orig 2009-11-06 10:28:08 UTC ++++ configure.in +@@ -97,11 +97,15 @@ esac linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;; *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;; esac +case "$target_os" in +freebsd*) TARGET_OS=FreeBSD ;; +esac AM_CONDITIONAL(GCC, test "$GCC" = "yes") AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu") AM_CONDITIONAL(AIX, test "$TARGET_OS" = AIX) AM_CONDITIONAL(HPUX, test "$TARGET_OS" = HPUX) +AM_CONDITIONAL(FreeBSD, test "$TARGET_OS" = FreeBSD) AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD") -@@ -153,7 +157,6 @@ +@@ -153,7 +157,6 @@ case "$target_os" in aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;; hpux*) AC_CHECK_HEADERS(nsswitch.h) ;; *) AC_CHECK_HEADERS(nss.h) - AC_CHECK_HEADERS(nsswitch.h) AC_CHECK_HEADERS(irs.h) ;; esac AC_CHECK_HEADERS(thread.h) -@@ -188,6 +191,14 @@ +@@ -188,6 +191,13 @@ AC_CHECK_HEADERS(krb5.h) AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h) AC_CHECK_HEADERS(krb5.h) +AC_MSG_CHECKING([if Kerberos is Heimdal]) +AC_TRY_LINK([#include ], -+ [char hv = heimdal_version;], -+ [hv = hv;], ++ [const char *hv = heimdal_version;], + [AC_MSG_RESULT(yes) + AC_DEFINE(HEIMDAL,1,[Define if Kerberos is Heimdal])], + [AC_MSG_RESULT(no)]) + AC_CHECK_LIB(resolv, main) AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(socket, main) -@@ -230,7 +241,6 @@ +@@ -230,7 +240,6 @@ AC_CHECK_LIB(pthread_nonshared, main) AC_CHECK_FUNCS(gethostbyname) AC_CHECK_FUNCS(nsdispatch) AC_CHECK_LIB(pthread_nonshared, main) -AC_CHECK_FUNCS(pthread_atfork) AC_CHECK_FUNCS(pthread_once) AC_CHECK_FUNCS(ether_aton) AC_CHECK_FUNCS(ether_ntoa)