diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-23 23:59:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-23 22:24:06 +0000 |
| commit | 9757a0c54cc6c8a6a0cb5bdec488316b969adcec (patch) | |
| tree | 42be5c519060432b475a1073a9273bdc3ed55ecb /lib | |
| parent | 7b8549348a98fbc43917bc56244637e9a8b25c37 (diff) | |
| download | samba-9757a0c54cc6c8a6a0cb5bdec488316b969adcec.tar.gz samba-9757a0c54cc6c8a6a0cb5bdec488316b969adcec.tar.bz2 samba-9757a0c54cc6c8a6a0cb5bdec488316b969adcec.zip | |
s4: Rename UID_WRAPPER to uid_wrapper.
Only link to uid_wrapper when it is enabled.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/uid_wrapper/wscript | 9 | ||||
| -rw-r--r-- | lib/uid_wrapper/wscript_build | 2 | ||||
| -rw-r--r-- | lib/util/wscript_build | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/uid_wrapper/wscript b/lib/uid_wrapper/wscript index 434d4fa5a8..1501d0e5ce 100644 --- a/lib/uid_wrapper/wscript +++ b/lib/uid_wrapper/wscript @@ -3,14 +3,15 @@ import Options def set_options(opt): - gr = opt.option_group('developer options') - gr.add_option('--enable-uid-wrapper', + gr = opt.option_group('developer options') + gr.add_option('--enable-uid-wrapper', help=("Turn on uid wrapper library (default=no)"), action="store_true", dest='enable_uid_wrapper', default=False) def configure(conf): if (Options.options.enable_uid_wrapper or - Options.options.developer or - Options.options.enable_selftest): + Options.options.developer or + Options.options.enable_selftest): conf.DEFINE('UID_WRAPPER', 1) + conf.ADD_GLOBAL_DEPENDENCY('uid_wrapper') diff --git a/lib/uid_wrapper/wscript_build b/lib/uid_wrapper/wscript_build index ec95d6c83c..2cb9868dec 100644 --- a/lib/uid_wrapper/wscript_build +++ b/lib/uid_wrapper/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('UID_WRAPPER', +bld.SAMBA_LIBRARY('uid_wrapper', source='uid_wrapper.c', deps='talloc', private_library=True diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 2647d62e0d..aacd415e72 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-UTIL', source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c select.c', - public_deps='talloc LIBCRYPTO CHARSET execinfo UID_WRAPPER', + public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper', public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h', header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ], local_include=False, @@ -20,7 +20,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL', bld.SAMBA_SUBSYSTEM('UNIX_PRIVS', source='unix_privs.c', autoproto='unix_privs.h', - deps='UID_WRAPPER', local_include=False, ) |