From 2933fac7c70b0cb5d38ebf02e4dcc2dd43fcfcd7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 23 Oct 2010 15:19:49 -0700 Subject: s4: Rename NSS_WRAPPER to nss_wrapper. Only link to nss_wrapper when it is enabled. Autobuild-User: Jelmer Vernooij Autobuild-Date: Sat Oct 23 23:05:44 UTC 2010 on sn-devel-104 --- lib/nss_wrapper/wscript | 13 +++++++------ lib/nss_wrapper/wscript_build | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/nss_wrapper') 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 -- cgit