summaryrefslogtreecommitdiff
path: root/www/curl
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2008-08-01 06:36:26 +0000
committerdsainty <dsainty@pkgsrc.org>2008-08-01 06:36:26 +0000
commit2f137667f70b37b7c83de7be37ff8e97ceaa8db1 (patch)
tree3d9e4d7424b0d4659ac0189303b2a1fbee11aa48 /www/curl
parentdee2cf20aa389d888a7d1fb12050564571f18ed3 (diff)
downloadpkgsrc-2f137667f70b37b7c83de7be37ff8e97ceaa8db1.tar.gz
If the 'ldap' option isn't selected, explicitly disable LDAP support. This prevents 'configure' from detecting non-Pkgsrc libldap.so (and, worse, linking with both a system libssl.so via system libldap.so, and also a Pkgsrc libssl.so directly. Euw...)
Diffstat (limited to 'www/curl')
-rw-r--r--www/curl/options.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/www/curl/options.mk b/www/curl/options.mk
index ba2f89951bf..68977303074 100644
--- a/www/curl/options.mk
+++ b/www/curl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/07/31 19:47:10 manu Exp $
+# $NetBSD: options.mk,v 1.6 2008/08/01 06:36:26 dsainty Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.curl
PKG_SUPPORTED_OPTIONS= inet6 libssh2 gssapi ldap
@@ -33,7 +33,8 @@ CONFIGURE_ARGS+= --without-gssapi
.if !empty(PKG_OPTIONS:Mldap)
.include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-ldap
-CONFIGURE_ARGS+= --enable-ldaps
+CONFIGURE_ARGS+= --enable-ldap
+CONFIGURE_ARGS+= --enable-ldaps
+.else
+CONFIGURE_ARGS+= --disable-ldap
.endif
-