summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjlam <jlam>2004-11-27 05:32:35 +0000
committerjlam <jlam>2004-11-27 05:32:35 +0000
commitbb5a25d4699cd1e31676d087bca0a4a7bece2e65 (patch)
tree87aa8a3d83a3a429ba9ced26dbfb8a39b33c5969 /databases
parentd93eaa2e73a576d197bf65e3890b36bb7fa1037a (diff)
downloadpkgsrc-bb5a25d4699cd1e31676d087bca0a4a7bece2e65.tar.gz
The OpenLDAP libraries do NOT include any SLP code, so don't include
openslp/buildlink3.mk. Also, simplify the kerberos/sasl checks.
Diffstat (limited to 'databases')
-rw-r--r--databases/openldap/buildlink3.mk13
1 files changed, 2 insertions, 11 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index cac7616c3e7..b4b024c30c4 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/11/18 19:07:04 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/11/27 05:32:35 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -20,18 +20,9 @@ BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
PKG_OPTIONS.openldap?= ${PKG_DEFAULT_OPTIONS}
-.if !empty(PKG_OPTIONS.openldap:Mkerberos)
-. if empty(PKG_OPTIONS.openldap:Msasl)
-PKG_OPTIONS.openldap+= sasl
-. endif
-.endif
-
-.if !empty(PKG_OPTIONS.openldap:Msasl)
+.if !empty(PKG_OPTIONS.openldap:Mkerberos) || !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/+$//}