summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2004-11-08 12:17:50 +0000
committermarkd <markd@pkgsrc.org>2004-11-08 12:17:50 +0000
commitbbe48768d24d984335cde1d6fb7956a885155695 (patch)
tree1919b9719a9bb845f8bbd8e0ab7030521674df0e /databases
parentbe2dcf4fcaf0b7cbe4f2e77d3c1117ded3d15ed3 (diff)
downloadpkgsrc-bbe48768d24d984335cde1d6fb7956a885155695.tar.gz
Bring options handling in buildlink3.mk into sync with current options.mk.
Diffstat (limited to 'databases')
-rw-r--r--databases/openldap/buildlink3.mk19
1 files changed, 11 insertions, 8 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index dbf0ecf6f66..53f9fcab4be 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2004/10/03 00:13:22 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2004/11/08 12:17:50 markd Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -20,15 +20,18 @@ BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
PKG_OPTIONS.openldap?= ${PKG_DEFAULT_OPTIONS}
-.if !empty(PKG_OPTIONS.openldap:Msasl)
-. if !defined(USE_SASL2) && !defined(USE_SASL)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
-. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-. include "../../security/cyrus-sasl2/buildlink3.mk"
-. elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-. include "../../security/cyrus-sasl/buildlink3.mk"
+.if !empty(PKG_OPTIONS.openldap:Mkerberos)
+. if empty(PKG_OPTIONS.openldap:Msasl)
+PKG_OPTIONS.openldap+= sasl
. endif
.endif
+
+.if !empty(PKG_OPTIONS.openldap:Msasl)
+. include "../../security/cyrus-sasl2/buildlink3.mk"
+.endif
+.if !empty(PKG_OPTIONS.openldap:Mslp)
+. include "../../net/openslp/buildlink3.mk"
+.endif
.include "../../security/openssl/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}