s4: Rename UID_WRAPPER to uid_wrapper.

Only link to uid_wrapper when it is enabled.

diff --git a/lib/uid_wrapper/wscript b/lib/uid_wrapper/wscript
index 434d4fa5a8777c60b5103fac49a2112f5895f251..1501d0e5ce76c0c44d5c8687cfc30570c598ae6e 100644 (file)
--- a/lib/uid_wrapper/wscript
+++ b/lib/uid_wrapper/wscript
@@ -3,14 +3,15 @@
 import Options
 
 def set_options(opt):
 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
                    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.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 ec95d6c83cfebb8626e6cf73c5d108ef6ce358ef..2cb9868dec0d8ce4be56999f4af9283f97c6456c 100644 (file)
--- a/lib/uid_wrapper/wscript_build
+++ b/lib/uid_wrapper/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
 #!/usr/bin/env python
 
 

-bld.SAMBA_LIBRARY('UID_WRAPPER',
+bld.SAMBA_LIBRARY('uid_wrapper',

                   source='uid_wrapper.c',
                   deps='talloc',
                   private_library=True
                   source='uid_wrapper.c',
                   deps='talloc',
                   private_library=True

diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 2647d62e0d59c6f4394d5b3efcb67e1510291165..aacd415e7227d231e1b0ed59575d660b7d2e5050 100644 (file)
--- 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',
 
 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,
        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',
 bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
        source='unix_privs.c',
        autoproto='unix_privs.h',

-       deps='UID_WRAPPER',

        local_include=False,
        )
 
        local_include=False,
        )
 

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index f783f3ac2c2ec1228ea0e5dbcb2f2e0be74e12cf..7f0c8e861afa28506f3e426c21a938c4be352e86 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -16,7 +16,7 @@ bld.SAMBA_BINARY('nsstest',
 
 bld.SAMBA_BINARY('wbinfo',
        source='wbinfo.c',
 
 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',
        )
 
 bld.SAMBA_LIBRARY('nss_winbind',

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index f70bebb30c9184804f8c2dfb06fbcb3dd01ebfbd..e315d93ab94d01f80dbbfcd8e6c60dfe33908ce7 100644 (file)
--- 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',
        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',
        )
 
 
 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 dc780b470b79533d04c29b182972bc2a49539fda..7b032c7cc69d94368c128f3365c2e3d69dc03fcc 100644 (file)
--- 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',
     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',
         )
 
         vnum='19.0.1',
         )
 

diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build
index 0678dde5d23cb15afb87a004fa425fc98608c419..cb0ffa247f5f30521d074b15f918d686e63a1cef 100644 (file)
--- 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',
        source='vfs_unixuid.c',
        subsystem='ntvfs',
        init_function='ntvfs_unixuid_init',

-       deps='SAMDB NSS_WRAPPER UID_WRAPPER'
+       deps='SAMDB NSS_WRAPPER'

        )
 
        )