s4: Rename UID_WRAPPER to uid_wrapper.

Only link to uid_wrapper when it is enabled.

7 files changed, 12 insertions, 12 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,
 	)
 
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index f783f3ac2c..7f0c8e861a 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -16,7 +16,7 @@ bld.SAMBA_BINARY('nsstest',
 
 bld.SAMBA_BINARY('wbinfo',
 	source='wbinfo.c',
-	deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ UID_WRAPPER LIBSECURITY LIBNDR NDR_SECURITY'
+	deps='LIBSAMBA-UTIL LIBCLI_AUTH popt POPT_SAMBA LIBWINBIND-CLIENT LIBWBCLIENT tevent UTIL_TEVENT LIBASYNC_REQ LIBSECURITY LIBNDR NDR_SECURITY'
 	)
 
 bld.SAMBA_LIBRARY('nss_winbind',
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index f70bebb30c..e315d93ab9 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -42,13 +42,13 @@ bld.SAMBA_MODULE('auth_unix',
 	source='auth_unix.c',
 	subsystem='auth',
 	init_function='auth_unix_init',
-	deps='pam PAM_ERRORS NSS_WRAPPER UID_WRAPPER LIBTSOCKET'
+	deps='pam PAM_ERRORS NSS_WRAPPER LIBTSOCKET'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
 	source='pam_errors.c',
-        deps='talloc'
+	deps='talloc'
 	)
 
 
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index dc780b470b..7b032c7cc6 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -467,7 +467,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
     HEIMDAL_LIBRARY('roken',
         ROKEN_SOURCE,
         includes='../heimdal/lib/roken ../heimdal/include ../../lib/socket_wrapper',
-        deps='resolv UID_WRAPPER util',
+        deps='resolv util',
         vnum='19.0.1',
         )
 
diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build
index 0678dde5d2..cb0ffa247f 100644
--- a/source4/ntvfs/unixuid/wscript_build
+++ b/source4/ntvfs/unixuid/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_MODULE('ntvfs_unixuid',
 	source='vfs_unixuid.c',
 	subsystem='ntvfs',
 	init_function='ntvfs_unixuid_init',
-	deps='SAMDB NSS_WRAPPER UID_WRAPPER'
+	deps='SAMDB NSS_WRAPPER'
 	)