summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-24 16:25:37 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:05 +1000
commita6ce1c3dce8c189c6454194e61f52a611c79d83d (patch)
treeb357425e4619c3dd3dc18941fd8536cd25a5bfc0 /source4/lib
parent9df6c861233c422b4d24fd017773745781e8815a (diff)
downloadsamba-a6ce1c3dce8c189c6454194e61f52a611c79d83d.tar.gz
samba-a6ce1c3dce8c189c6454194e61f52a611c79d83d.tar.bz2
samba-a6ce1c3dce8c189c6454194e61f52a611c79d83d.zip
build: need to mark disabled libraries as DISABLED
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/tls/wscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript
index 6f517de48d..c8427c781f 100644
--- a/source4/lib/tls/wscript
+++ b/source4/lib/tls/wscript
@@ -12,6 +12,9 @@ def set_options(opt):
def configure(conf):
conf.env.enable_gnutls = Options.options.enable_gnutls
if not conf.env.enable_gnutls:
+ conf.SET_TARGET_TYPE('gnutls', 'DISABLED')
+ conf.SET_TARGET_TYPE('gcrypt', 'DISABLED')
+ conf.SET_TARGET_TYPE('gpg-error', 'DISABLED')
return
conf.check_cfg(package='gnutls',
@@ -44,6 +47,5 @@ def configure(conf):
def build(bld):
bld.SAMBA_SUBSYSTEM('LIBTLS',
source='tls.c tlscert.c',
- public_deps='talloc gnutls gcrypt LIBSAMBA-HOSTCONFIG samba_socket',
- enabled = bld.env.enable_gnutls
+ public_deps='talloc gnutls gcrypt LIBSAMBA-HOSTCONFIG samba_socket'
)