diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile index dc3da60e6..c494894c1 100644 --- a/net/nss_ldap/Makefile +++ b/net/nss_ldap/Makefile @@ -35,7 +35,9 @@ HEIMDAL_RUN_DEPENDS= ${LOCALBASE}/lib/heimdal/libkrb5.so:${PORTSDIR}/security/he MIT_BUILD_DEPENDS= ${LOCALBASE}/lib/libkrb5.so:${PORTSDIR}/security/krb5 HEIMDAL_BUILD_DEPENDS= ${LOCALBASE}/lib/heimdal/libkrb5.so:${PORTSDIR}/security/heimdal -HEIMDAL_LDFLAGS= -L${LOCALBASE}/lib/heimdal +HEIMDAL_LDFLAGS= -l:${LOCALBASE}/lib/heimdal/libkrb5.so -l:${LOCALBASE}/lib/heimdal/libgssapi_krb5.so +MIT_LDFLAGS= -l:${LOCALBASE}/lib/libkrb5.so -l:${LOCALBASE}/lib/libgssapi_krb5.so +SYSTEMKRB_LDFLAGS= -l:/usr/lib/libkrb5.so -l:/usr/lib/libgssapi_krb5.so LCLASS_DESC= Enable login classes via the loginClass attribute diff --git a/net/nss_ldap/files/patch-configure.in b/net/nss_ldap/files/patch-configure.in index bd6f78efe..bb38cf2c5 100644 --- a/net/nss_ldap/files/patch-configure.in +++ b/net/nss_ldap/files/patch-configure.in @@ -46,3 +46,26 @@ AC_CHECK_FUNCS(pthread_once) AC_CHECK_FUNCS(ether_aton) AC_CHECK_FUNCS(ether_ntoa) +@@ -289,17 +298,17 @@ + AC_CHECK_LIB(dl, dlopen,[LIBS="-ldl $LIBS"],,$LIBS) + dnl AC_CHECK_LIB(db, main,[LIBS="-ldb $LIBS"],,$LIBS) + +-AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,[LIBS="-lgssapi $LIBS" found_gssapi_lib=yes],,$LIBS) +-if test -z "$found_gssapi_lib"; then +- AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name,[LIBS="-lgssapi_krb5 $LIBS"],,$LIBS) +-fi ++#AC_CHECK_LIB(gssapi, gss_krb5_ccache_name,[LIBS="-lgssapi $LIBS" found_gssapi_lib=yes],,$LIBS) ++#if test -z "$found_gssapi_lib"; then ++# AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name,[LIBS="-lgssapi_krb5 $LIBS"],,$LIBS) ++#fi + + dnl Following checks probably not strictly necessary. + dnl AC_CHECK_LIB(crypto, main,[LIBS="-lcrypto $LIBS"],,$LIBS) + dnl AC_CHECK_LIB(ssl, main,[LIBS="-lssl $LIBS"],,$LIBS) + AC_CHECK_LIB(com_err, main,[LIBS="-lcom_err $LIBS"],,$LIBS) + dnl AC_CHECK_LIB(k5crypto, main,[LIBS="-lk5crypto $LIBS"],,$LIBS) +-AC_CHECK_LIB(krb5, main,[LIBS="-lkrb5 $LIBS"],,$LIBS) ++#AC_CHECK_LIB(krb5, main,[LIBS="-lkrb5 $LIBS"],,$LIBS) + dnl AC_CHECK_LIB(krb4, main,[LIBS="-lkrb4 $LIBS"],,$LIBS) + AC_CHECK_LIB(sasl2, sasl_client_init) +