summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-23 15:19:49 -0700
committerJelmer Vernooij <jelmer@samba.org>2010-10-23 23:05:43 +0000
commit2933fac7c70b0cb5d38ebf02e4dcc2dd43fcfcd7 (patch)
tree0ebd5431652b43633890fa123fe016672b364e4b /lib
parent9757a0c54cc6c8a6a0cb5bdec488316b969adcec (diff)
downloadsamba-2933fac7c70b0cb5d38ebf02e4dcc2dd43fcfcd7.tar.gz
samba-2933fac7c70b0cb5d38ebf02e4dcc2dd43fcfcd7.tar.bz2
samba-2933fac7c70b0cb5d38ebf02e4dcc2dd43fcfcd7.zip
s4: Rename NSS_WRAPPER to nss_wrapper.
Only link to nss_wrapper when it is enabled. Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sat Oct 23 23:05:44 UTC 2010 on sn-devel-104
Diffstat (limited to 'lib')
-rw-r--r--lib/nss_wrapper/wscript13
-rw-r--r--lib/nss_wrapper/wscript_build2
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
index 2ab72efb05..5cfff1f76c 100644
--- a/lib/nss_wrapper/wscript
+++ b/lib/nss_wrapper/wscript
@@ -3,14 +3,15 @@
import Options
def set_options(opt):
- gr = opt.option_group('developer options')
- gr.add_option('--enable-nss-wrapper',
- help=("Turn on nss wrapper library (default=no)"),
- action="store_true", dest='enable_nss_wrapper', default=False)
+ gr = opt.option_group('developer options')
+ gr.add_option('--enable-nss-wrapper',
+ help=("Turn on nss wrapper library (default=no)"),
+ action="store_true", dest='enable_nss_wrapper', default=False)
def configure(conf):
if (Options.options.enable_nss_wrapper or
- Options.options.developer or
- Options.options.enable_selftest):
+ Options.options.developer or
+ Options.options.enable_selftest):
conf.DEFINE('NSS_WRAPPER', 1)
+ conf.ADD_GLOBAL_DEPENDENCY('nss_wrapper')
diff --git a/lib/nss_wrapper/wscript_build b/lib/nss_wrapper/wscript_build
index a293d54929..80045731c7 100644
--- a/lib/nss_wrapper/wscript_build
+++ b/lib/nss_wrapper/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('NSS_WRAPPER',
+bld.SAMBA_LIBRARY('nss_wrapper',
source='nss_wrapper.c',
deps='replace',
private_library=True