[pkgsrc/trunk]: pkgsrc/databases/openldap The OpenLDAP libraries do NOT inclu...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f8532b24c391
branches:  trunk
changeset: 484355:f8532b24c391
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Nov 27 05:32:35 2004 +0000

description:
The OpenLDAP libraries do NOT include any SLP code, so don't include
openslp/buildlink3.mk.  Also, simplify the kerberos/sasl checks.

diffstat:

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

diffs (29 lines):

diff -r 030e4f2936aa -r f8532b24c391 databases/openldap/buildlink3.mk
--- a/databases/openldap/buildlink3.mk  Sat Nov 27 05:08:35 2004 +0000
+++ b/databases/openldap/buildlink3.mk  Sat Nov 27 05:32:35 2004 +0000
@@ -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 @@
 
 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/+$//}