pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/openldap If dynamic and bdb options are used...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdc52d06d142
branches:  trunk
changeset: 487265:cdc52d06d142
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Jan 12 01:50:15 2005 +0000

description:
If dynamic and bdb options are used, the hdb module is built, but not
if bdb is disabled, so only build it when the bdb option has been
enabled.

diffstat:

 databases/openldap/PLIST      |  4 ++--
 databases/openldap/options.mk |  7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 25e31bc4eb2d -r cdc52d06d142 databases/openldap/PLIST
--- a/databases/openldap/PLIST  Wed Jan 12 00:02:00 2005 +0000
+++ b/databases/openldap/PLIST  Wed Jan 12 01:50:15 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2004/11/08 18:42:09 tv Exp $
+@comment $NetBSD: PLIST,v 1.20 2005/01/12 01:50:15 xtraeme Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -19,7 +19,7 @@
 lib/libldap.la
 lib/libldap_r.la
 ${DYNAMIC_MOD}lib/openldap/back_dnssrv.la
-${DYNAMIC_MOD}lib/openldap/back_hdb.la
+${DYNAMIC_MOD}${HDB_MODULE}lib/openldap/back_hdb.la
 ${DYNAMIC_MOD}lib/openldap/back_ldap.la
 ${DYNAMIC_MOD}lib/openldap/back_ldbm.la
 ${DYNAMIC_MOD}lib/openldap/back_meta.la
diff -r 25e31bc4eb2d -r cdc52d06d142 databases/openldap/options.mk
--- a/databases/openldap/options.mk     Wed Jan 12 00:02:00 2005 +0000
+++ b/databases/openldap/options.mk     Wed Jan 12 01:50:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2004/11/29 01:10:04 tv Exp $
+# $NetBSD: options.mk,v 1.9 2005/01/12 01:50:15 xtraeme Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap
 PKG_SUPPORTED_OPTIONS= bdb dynamic kerberos sasl slp
@@ -28,6 +28,11 @@
 ### specified, then link the backend modules statically into slapd.
 ###
 .if !empty(PKG_OPTIONS:Mdynamic)
+.  if !empty(PKG_OPTIONS:Mbdb)
+PLIST_SUBST+=          HDB_MODULE=
+.  else
+PLIST_SUBST+=          HDB_MODULE="@comment "
+.  endif
 .  include "../../devel/libltdl/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-modules
 PLIST_SUBST+=          DYNAMIC_MOD=



Home | Main Index | Thread Index | Old Index