From bb5a25d4699cd1e31676d087bca0a4a7bece2e65 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 27 Nov 2004 05:32:35 +0000
Subject: The OpenLDAP libraries do NOT include any SLP code, so don't include
 openslp/buildlink3.mk.  Also, simplify the kerberos/sasl checks.

---
 databases/openldap/buildlink3.mk | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'databases')

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/+$//}
-- 
cgit v1.2.3