From a6ce1c3dce8c189c6454194e61f52a611c79d83d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 24 Mar 2010 16:25:37 +1100 Subject: build: need to mark disabled libraries as DISABLED --- source4/lib/tls/wscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/lib/tls') 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' ) -- cgit