summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/nss_wrapper/wscript13
-rw-r--r--lib/nss_wrapper/wscript_build2
-rw-r--r--nsswitch/wscript_build2
-rw-r--r--source3/wscript_build16
-rw-r--r--source4/auth/ntlm/wscript_build2
-rw-r--r--source4/dsdb/samdb/ldb_modules/wscript_build4
-rw-r--r--source4/dsdb/wscript_build2
-rw-r--r--source4/ntvfs/unixuid/wscript_build2
-rw-r--r--source4/rpc_server/wscript_build2
-rw-r--r--source4/torture/local/wscript_build2
10 files changed, 24 insertions, 23 deletions
diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
index 2ab72efb05..5cfff1f76c 100644
--- a/lib/nss_wrapper/wscript
+++ b/lib/nss_wrapper/wscript
@@ -3,14 +3,15 @@
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
- Options.options.developer or
- Options.options.enable_selftest):
+ Options.options.developer or
+ Options.options.enable_selftest):
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 a293d54929..80045731c7 100644
--- a/lib/nss_wrapper/wscript_build
+++ b/lib/nss_wrapper/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('NSS_WRAPPER',
+bld.SAMBA_LIBRARY('nss_wrapper',
source='nss_wrapper.c',
deps='replace',
private_library=True
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 7f0c8e861a..5468d92768 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('LIBWINBIND-CLIENT',
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 9ee2cbc77f..649b30ece0 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1049,7 +1049,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
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',
@@ -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
- 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
@@ -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
- 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,
- 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
@@ -1313,7 +1313,7 @@ bld.SAMBA_BINARY('smbspool',
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())
@@ -1418,7 +1418,7 @@ bld.SAMBA_BINARY('locktest',
bld.SAMBA_BINARY('nsstest',
source=NSSTEST_SRC,
- deps='NSS_WRAPPER',
+ deps='',
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
- 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())
@@ -1512,7 +1512,7 @@ bld.SAMBA_BINARY('split_tokens',
bld.SAMBA_BINARY('vlp',
source=VLP_SRC,
- deps='''talloc tdb NSS_WRAPPER''',
+ deps='''talloc tdb''',
vars=locals())
swat_files=recursive_dirlist('../swat', '../swat', '*')
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
)
generated by cgit (git 2.34.1) at 2024-11-22 02:28:06 +0000