diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-24 16:25:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:05 +1000 |
| commit | a6ce1c3dce8c189c6454194e61f52a611c79d83d (patch) | |
| tree | b357425e4619c3dd3dc18941fd8536cd25a5bfc0 | |
| parent | 9df6c861233c422b4d24fd017773745781e8815a (diff) | |
| download | samba-a6ce1c3dce8c189c6454194e61f52a611c79d83d.tar.gz | |
build: need to mark disabled libraries as DISABLED
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 1 | ||||
| -rw-r--r-- | source4/lib/tls/wscript | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index fe290a33e17..59003d82126 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -23,6 +23,7 @@ def NEW_NODE(node, name): ############################################################# # set a value in a local cache # return False if it's already set +@conf def SET_TARGET_TYPE(ctx, target, value): cache = LOCAL_CACHE(ctx, 'TARGET_TYPE') if target in cache: diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index 6f517de48d9..c8427c781fe 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' ) |