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

6 files changed, 7 insertions, 7 deletions

diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index e315d93ab9..20d914c8f9 100644
--- 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',
-	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 2c28e56402..3f56ea31ff 100644
--- 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,
-	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,
-	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 7f71d95dc7..89ff2a06d7 100644
--- 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',
-	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'
 	)
 
diff --git a/source4/ntvfs/unixuid/wscript_build b/source4/ntvfs/unixuid/wscript_build
index cb0ffa247f..29ef43c1c3 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'
+	deps='SAMDB'
 	)
 
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index afadd95385..047a2c1107 100644
--- 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',
-	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 f24402a55c..ddea36c790 100644
--- 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',
-	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
 	)