summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-31 10:38:16 +0000
committerjlam <jlam@pkgsrc.org>2004-03-31 10:38:16 +0000
commitf7432dac73e2236818324adeadcdd1f0ad2cdb3a (patch)
tree7771f1831984b206cee7d4e60769f58a0086382c
parentd34d03065e79ba5b62a954f3d6e4eefc9246721f (diff)
downloadpkgsrc-f7432dac73e2236818324adeadcdd1f0ad2cdb3a.tar.gz
Ensure that we use the db3 library, even if the db4 one gets pulled in
as an indirect dependency.
-rw-r--r--mail/cyrus-imapd21/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 116ceb7ec10..38688fb1463 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/31 10:23:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/31 10:38:16 jlam Exp $
DISTNAME= cyrus-imapd-2.1.15
PKGREVISION= 3
@@ -44,8 +44,6 @@ CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER}
CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP}
CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus
CONFIGURE_ARGS+= --with-statedir=/var/run
-CONFIGURE_ARGS+= --with-bdb-libdir=${BUILDLINK_PREFIX.db3}/lib
-CONFIGURE_ARGS+= --with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
CONFIGURE_ARGS+= --with-perl=${PERL5}
@@ -70,6 +68,16 @@ CONFIGURE_ARGS+= --with-subs-db=flat
CONFIGURE_ARGS+= --with-tls-db=db3_nosync
.endif
+# Ensure that we use the db3 library, even if the db4 one gets pulled in
+# as an indirect dependency.
+#
+.include "../../databases/db3/buildlink3.mk"
+CONFIGURE_ARGS+= --with-bdb-libdir=${BUILDLINK_PREFIX.db3}/lib
+CONFIGURE_ARGS+= --with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
+.for _var_ in db_4_1 db4_1 db41 db_4_0 db4_0 db_4 db40 db4
+CONFIGURE_ENV+= ac_cv_lib_${_var_}_db_create=no
+.endfor
+
.if defined(KERBEROS)
. if (${KERBEROS} == 4) && exists(/usr/include/kerberosIV/krb.h)
PKG_USE_KERBEROS= yes
@@ -114,7 +122,6 @@ PERL5_PACKLIST= \
${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist \
${PERL5_SITEARCH}/auto/Cyrus/SIEVE/managesieve/.packlist
-.include "../../databases/db3/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../security/cyrus-sasl2/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"