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

diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
index 2ab72efb05731dc7d3e690373dea314bfbf77e28..5cfff1f76cb5a50cf7c53b7ec85a5652736364b7 100644 (file)
--- a/lib/nss_wrapper/wscript
+++ b/lib/nss_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-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
 
 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.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 a293d54929800eb19f7dacae0ce935d2148b236d..80045731c7ffa84dcb20bf428cff87a3f5359aa6 100644 (file)
--- a/lib/nss_wrapper/wscript_build
+++ b/lib/nss_wrapper/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 
 #!/usr/bin/env python
 
 

-bld.SAMBA_LIBRARY('NSS_WRAPPER',
+bld.SAMBA_LIBRARY('nss_wrapper',

                   source='nss_wrapper.c',
                   deps='replace',
                   private_library=True
                   source='nss_wrapper.c',
                   deps='replace',
                   private_library=True

diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 7f0c8e861afa28506f3e426c21a938c4be352e86..5468d92768e6da0756ce403ca702ed80c53a6973 100644 (file)
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('LIBWINBIND-CLIENT',
 
 bld.SAMBA_BINARY('nsstest',
        source='nsstest.c',
 
 bld.SAMBA_BINARY('nsstest',
        source='nsstest.c',

-       deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
+       deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG'

        )
 
 
        )
 
 

diff --git a/source3/wscript_build b/source3/wscript_build
index 9ee2cbc77ffc00796b44b9336b4550d76f5596f2..649b30ece0a74791094222094f056ddf25fb4261 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1049,7 +1049,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,

-                    deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY charset NDR_MESSAGING',
+                    deps='iconv LIBCRYPTO LIBNDR LIBSECURITY NDR_SECURITY charset NDR_MESSAGING',

                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',


@@ -1117,7 +1117,7 @@ bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
 bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     source=SMBD_SRC_BASE,
                     deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
 bld.SAMBA_SUBSYSTEM('SMBD_BASE',
                     source=SMBD_SRC_BASE,
                     deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5

-                    NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB
+                    DYNCONFIG libwbclient crypt nsl cups cap resolv ZLIB PASSDB

                     PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
                     vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
                     PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
                     vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE


@@ -1249,14 +1249,14 @@ bld.SAMBA_BINARY('smbd/smbd',
 bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
                  deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl
 bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
                  deps='''talloc tdb tevent ZLIB cap resolv libwbclient dl

-                 NSS_WRAPPER PASSDB PARAM ldap LIB_NONSMBD LIBSMB
+                 PASSDB PARAM ldap LIB_NONSMBD LIBSMB

                  POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
                  install_path='${SBINDIR}',
                  vars=locals())
 
 bld.SAMBA_BINARY('winbindd/winbindd',
                  source=WINBINDD_SRC,
                  POPT_SAMBA KRBCLIENT NDR_SAMR NDR_LSA''',
                  install_path='${SBINDIR}',
                  vars=locals())
 
 bld.SAMBA_BINARY('winbindd/winbindd',
                  source=WINBINDD_SRC,

-                 deps='''talloc tdb tevent cap dl ZLIB NSS_WRAPPER
+                 deps='''talloc tdb tevent cap dl ZLIB 

                  libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
                  SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
                  libwbclient PASSDB ldap resolv PARAM LIB_NONSMBD LIBSMB
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
                  SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS


@@ -1313,7 +1313,7 @@ bld.SAMBA_BINARY('smbspool',
 
 bld.SAMBA_BINARY('testparm',
                  source=TESTPARM_SRC,
 
 bld.SAMBA_BINARY('testparm',
                  source=TESTPARM_SRC,

-                 deps='''talloc tevent ldap cap NSS_WRAPPER
+                 deps='''talloc tevent ldap cap 

                  libwbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
                  LIBSMB_ERR POPT_SAMBA''',
                  vars=locals())
                  libwbclient ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
                  LIBSMB_ERR POPT_SAMBA''',
                  vars=locals())


@@ -1418,7 +1418,7 @@ bld.SAMBA_BINARY('locktest',
 
 bld.SAMBA_BINARY('nsstest',
                  source=NSSTEST_SRC,
 
 bld.SAMBA_BINARY('nsstest',
                  source=NSSTEST_SRC,

-                 deps='NSS_WRAPPER',
+                 deps='',

                  vars=locals())
 
 bld.SAMBA_BINARY('pdbtest',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbtest',


@@ -1466,7 +1466,7 @@ bld.SAMBA_BINARY('versiontest',
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc libwbclient tevent cap
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc libwbclient tevent cap

-                 NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
+                 ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD

                  LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
                  vars=locals())
 
                  LIBSAMBA POPT_SAMBA LIBAFS_SETTOKEN''',
                  vars=locals())
 


@@ -1512,7 +1512,7 @@ bld.SAMBA_BINARY('split_tokens',
 
 bld.SAMBA_BINARY('vlp',
                  source=VLP_SRC,
 
 bld.SAMBA_BINARY('vlp',
                  source=VLP_SRC,

-                 deps='''talloc tdb NSS_WRAPPER''',
+                 deps='''talloc tdb''',

                  vars=locals())
 
 swat_files=recursive_dirlist('../swat', '../swat', '*')
                  vars=locals())
 
 swat_files=recursive_dirlist('../swat', '../swat', '*')

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index e315d93ab94d01f80dbbfcd8e6c60dfe33908ce7..20d914c8f95cf43eb85d9f7284bbee84f17a7413 100644 (file)
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -42,7 +42,7 @@ 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 LIBTSOCKET'
+       deps='pam PAM_ERRORS LIBTSOCKET'

        )
 
 
        )
 
 

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 2c28e5640240eb0e31deaa7337f65b7054928024..3f56ea31ff754d36e59dcc3be21b42e4c10d6c26 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sam)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sam)',
        internal_module=False,

-       deps='talloc libevents ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
+       deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY'

        )
 
 
        )
 
 


@@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sid)',
        internal_module=False,
        subsystem='ldb',
        init_function='LDB_MODULE(samba3sid)',
        internal_module=False,

-       deps='talloc libevents ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
+       deps='talloc libevents ldb SMBPASSWD LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'

        )
 
 
        )
 
 

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 7f71d95dc70a2f899f6b0364cf2b8dea6756101f..89ff2a06d72961d68ee1682d0bf9d71c916a0885 100644 (file)
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('SAMDB',
        source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c',
        autoproto='samdb/samdb_proto.h',
        public_deps='krb5',
        source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c',
        autoproto='samdb/samdb_proto.h',
        public_deps='krb5',

-       deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS',
+       deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS',

        vnum='0.0.1'
        )
 
        vnum='0.0.1'
        )
 

diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build
index cb0ffa247f5f30521d074b15f918d686e63a1cef..29ef43c1c30271010f02168d94b9c7978b442ae8 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'
+       deps='SAMDB'

        )
 
        )
 

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index afadd953859d0af2a646edd9ba3acdedc3c6931e..047a2c1107b88ace33c17753a4f29e9be348e9fa 100644 (file)
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -60,7 +60,7 @@ bld.SAMBA_MODULE('dcerpc_unixinfo',
        source='unixinfo/dcesrv_unixinfo.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_unixinfo_init',
        source='unixinfo/dcesrv_unixinfo.c',
        subsystem='dcerpc_server',
        init_function='dcerpc_server_unixinfo_init',

-       deps='DCERPC_COMMON SAMDB NDR_UNIXINFO NSS_WRAPPER LIBWBCLIENT_OLD'
+       deps='DCERPC_COMMON SAMDB NDR_UNIXINFO LIBWBCLIENT_OLD'

        )
 
 
        )
 
 

diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
index f24402a55ceeb5afd526b437a6cd2e6a37b888e6..ddea36c790baa279f6f1894701ed906c918d0c0c 100644 (file)
--- a/source4/torture/local/wscript_build
+++ b/source4/torture/local/wscript_build
@@ -5,6 +5,6 @@ bld.SAMBA_MODULE('TORTURE_LOCAL',
        autoproto='proto.h',
        subsystem='smbtorture',
        init_function='torture_local_init',
        autoproto='proto.h',
        subsystem='smbtorture',
        init_function='torture_local_init',

-       deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION NSS_WRAPPER ldb SAMDB',
+       deps='RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb SAMDB',

        internal_module=True
        )
        internal_module=True
        )