The branch, master has been updated
via 2933fac s4: Rename NSS_WRAPPER to nss_wrapper.
via 9757a0c s4: Rename UID_WRAPPER to uid_wrapper.
via 7b85493 s4: Rename WRAP_XATTR to wrap_xattr.
via cf26d8a s4: Rename LIBEVENTS to libevents.
via bc44fcc s4: Rename NDR_TABLE to ndr_table.
via 9065f96 s4: Rename LIBNETIF to libnetif.
via 49ef288 waf: Rename some BUNDLED_ functios to PRIVATE_.
from 18103d3 create_descriptor.c - fix comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2933fac7c70b0cb5d38ebf02e4dcc2dd43fcfcd7
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 15:19:49 2010 -0700
s4: Rename NSS_WRAPPER to nss_wrapper.
Only link to nss_wrapper when it is enabled.
Autobuild-User: Jelmer Vernooij <[email protected]>
Autobuild-Date: Sat Oct 23 23:05:44 UTC 2010 on sn-devel-104
commit 9757a0c54cc6c8a6a0cb5bdec488316b969adcec
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 23:59:43 2010 +0200
s4: Rename UID_WRAPPER to uid_wrapper.
Only link to uid_wrapper when it is enabled.
commit 7b8549348a98fbc43917bc56244637e9a8b25c37
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 23:53:08 2010 +0200
s4: Rename WRAP_XATTR to wrap_xattr.
commit cf26d8a958256e1f56f9bc5a9611868d04a15e74
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 23:49:33 2010 +0200
s4: Rename LIBEVENTS to libevents.
commit bc44fcc6fb17eb9db9c9dcef08b6c88626c90819
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 23:41:19 2010 +0200
s4: Rename NDR_TABLE to ndr_table.
commit 9065f9644bd32d6ca3a8b9a77d67e0b30891a321
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 23:36:32 2010 +0200
s4: Rename LIBNETIF to libnetif.
commit 49ef2888193dd7cc37c3fe0a980b7cc1abdac805
Author: Jelmer Vernooij <[email protected]>
Date: Sat Oct 23 23:26:43 2010 +0200
waf: Rename some BUNDLED_ functios to PRIVATE_.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_bundled.py | 18 +++---
buildtools/wafsamba/wafsamba.py | 2 +-
buildtools/wafsamba/wscript | 20 ++++----
lib/nss_wrapper/wscript | 13 +++--
lib/nss_wrapper/wscript_build | 2 +-
lib/replace/wscript | 2 +-
lib/talloc/wscript | 2 +-
lib/tdb/wscript | 2 +-
lib/tevent/wscript | 2 +-
lib/uid_wrapper/wscript | 9 ++--
lib/uid_wrapper/wscript_build | 2 +-
lib/util/wscript_build | 17 +++---
libcli/nbt/wscript_build | 12 ++--
nsswitch/wscript_build | 4 +-
source3/wscript_build | 16 +++---
source4/auth/credentials/wscript_build | 2 +-
source4/auth/ntlm/wscript_build | 4 +-
source4/cldap_server/wscript_build | 2 +-
source4/dsdb/samdb/ldb_modules/wscript_build | 68 +++++++++++++-------------
source4/dsdb/wscript_build | 2 +-
source4/heimdal_build/wscript_build | 2 +-
source4/lib/com/wscript_build | 2 +-
source4/lib/events/wscript_build | 2 +-
source4/lib/ldb/wscript | 2 +-
source4/lib/messaging/wscript_build | 2 +-
source4/lib/socket/wscript_build | 44 ++++++++---------
source4/lib/wmi/wscript_build | 2 +-
source4/libcli/wbclient/wscript_build | 2 +-
source4/libcli/wscript_build | 6 +-
source4/librpc/wscript_build | 12 ++--
source4/nbt_server/wscript_build | 2 +-
source4/ntvfs/posix/wscript_build | 4 +-
source4/ntvfs/sysdep/wscript_build | 2 +-
source4/ntvfs/unixuid/wscript_build | 2 +-
source4/rpc_server/wscript_build | 6 +-
source4/scripting/python/wscript_build | 48 +++++++++---------
source4/smbd/wscript_build | 8 ++--
source4/torture/drs/wscript_build | 2 +-
source4/torture/local/wscript_build | 2 +-
source4/torture/wscript_build | 2 +-
source4/utils/wscript_build | 2 +-
source4/wscript | 2 +-
42 files changed, 178 insertions(+), 181 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index e5310da..d395b82 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -4,13 +4,13 @@ from Configure import conf
import Logs
from samba_utils import *
-def BUNDLED_NAME(bld, name, bundled_extension, private_library):
+def PRIVATE_NAME(bld, name, bundled_extension, private_library):
'''possibly rename a library to include a bundled extension'''
if bld.env.DISABLE_SHARED or not bundled_extension:
return name
- if name in bld.env.BUNDLED_EXTENSION_EXCEPTION and not private_library:
+ if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library:
return name
- extension = getattr(bld.env, 'BUNDLED_EXTENSION', '')
+ extension = getattr(bld.env, 'PRIVATE_EXTENSION', '')
if extension:
return name + '-' + extension
return name
@@ -46,13 +46,13 @@ def BUILTIN_DEFAULT(opt, builtins):
Options.Handler.BUILTIN_DEFAULT = BUILTIN_DEFAULT
-def BUNDLED_EXTENSION_DEFAULT(opt, extension, noextension=''):
- '''set a default bundled library extension'''
- if 'BUNDLED_EXTENSION_DEFAULT' in Options.options:
+def PRIVATE_EXTENSION_DEFAULT(opt, extension, noextension=''):
+ '''set a default private library extension'''
+ if 'PRIVATE_EXTENSION_DEFAULT' in Options.options:
return
- Options.options['BUNDLED_EXTENSION_DEFAULT'] = extension
- Options.options['BUNDLED_EXTENSION_EXCEPTION'] = noextension
-Options.Handler.BUNDLED_EXTENSION_DEFAULT = BUNDLED_EXTENSION_DEFAULT
+ Options.options['PRIVATE_EXTENSION_DEFAULT'] = extension
+ Options.options['PRIVATE_EXTENSION_EXCEPTION'] = noextension
+Options.Handler.PRIVATE_EXTENSION_DEFAULT = PRIVATE_EXTENSION_DEFAULT
def minimum_library_version(conf, libname, default):
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 7108715..eb0c369 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -179,7 +179,7 @@ def SAMBA_LIBRARY(bld, libname, source,
while bundled_name.startswith("lib"):
bundled_name = bundled_name[3:]
else:
- bundled_name = BUNDLED_NAME(bld, libname, bundled_extension,
private_library)
+ bundled_name = PRIVATE_NAME(bld, libname, bundled_extension,
private_library)
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 9dc6910..d705216 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -27,15 +27,15 @@ def set_options(opt):
help=("comma separated list of bundled libraries. May
include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"),
action="store", dest='BUNDLED_LIBS', default='')
- extension_default = Options.options['BUNDLED_EXTENSION_DEFAULT']
- gr.add_option('--bundled-library-extension',
- help=("name extension for bundled libraries [%s]" %
extension_default),
- action="store", dest='BUNDLED_EXTENSION',
default=extension_default)
+ extension_default = Options.options['PRIVATE_EXTENSION_DEFAULT']
+ gr.add_option('--private-library-extension',
+ help=("name extension for private libraries [%s]" %
extension_default),
+ action="store", dest='PRIVATE_EXTENSION',
default=extension_default)
- extension_exception = Options.options['BUNDLED_EXTENSION_EXCEPTION']
- gr.add_option('--bundled-extension-exception',
- help=("comman separated list of libraries to not apply
extension to [%s]" % extension_exception),
- action="store", dest='BUNDLED_EXTENSION_EXCEPTION',
default=extension_exception)
+ extension_exception = Options.options['PRIVATE_EXTENSION_EXCEPTION']
+ gr.add_option('--private-extension-exception',
+ help=("comma separated list of libraries to not apply
extension to [%s]" % extension_exception),
+ action="store", dest='PRIVATE_EXTENSION_EXCEPTION',
default=extension_exception)
builtin_defauilt = Options.options['BUILTIN_LIBRARIES_DEFAULT']
gr.add_option('--builtin-libraries',
@@ -202,8 +202,8 @@ def configure(conf):
conf.env.DISABLE_SHARED = Options.options.disable_shared
conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',')
- conf.env.BUNDLED_EXTENSION = Options.options.BUNDLED_EXTENSION
- conf.env.BUNDLED_EXTENSION_EXCEPTION =
Options.options.BUNDLED_EXTENSION_EXCEPTION.split(',')
+ conf.env.PRIVATE_EXTENSION = Options.options.PRIVATE_EXTENSION
+ conf.env.PRIVATE_EXTENSION_EXCEPTION =
Options.options.PRIVATE_EXTENSION_EXCEPTION.split(',')
conf.env.CROSS_COMPILE = Options.options.CROSS_COMPILE
conf.env.CROSS_EXECUTE = Options.options.CROSS_EXECUTE
diff --git a/lib/nss_wrapper/wscript b/lib/nss_wrapper/wscript
index 2ab72ef..5cfff1f 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 a293d54..8004573 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/lib/replace/wscript b/lib/replace/wscript
index 95cbb37..8786eca 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -20,7 +20,7 @@ samba_dist.DIST_DIRS('lib/replace buildtools:buildtools')
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
- opt.BUNDLED_EXTENSION_DEFAULT('')
+ opt.PRIVATE_EXTENSION_DEFAULT('')
opt.RECURSE('buildtools/wafsamba')
@wafsamba.runonce
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index bdf21a3..56de6ea 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -24,7 +24,7 @@ samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace
buildtools:buildtools
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
- opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextension='talloc')
+ opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
opt.RECURSE('lib/replace')
opt.add_option('--enable-talloc-compat1',
help=("Build talloc 1.x.x compat library [False]"),
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 5c2ecaf..37af34c 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -19,7 +19,7 @@ samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace
buildtools:buildtools')
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
- opt.BUNDLED_EXTENSION_DEFAULT('tdb', noextension='tdb')
+ opt.PRIVATE_EXTENSION_DEFAULT('tdb', noextension='tdb')
opt.RECURSE('lib/replace')
if opt.IN_LAUNCH_DIR():
opt.add_option('--disable-python',
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 43d23e5..a502860 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -19,7 +19,7 @@ samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace
lib/talloc:lib/talloc
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
- opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextension='tevent')
+ opt.PRIVATE_EXTENSION_DEFAULT('tevent', noextension='tevent')
opt.RECURSE('lib/replace')
opt.RECURSE('lib/talloc')
if opt.IN_LAUNCH_DIR():
diff --git a/lib/uid_wrapper/wscript b/lib/uid_wrapper/wscript
index 434d4fa..1501d0e 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 ec95d6c..2cb9868 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 e1030c8..aacd415 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,18 +20,17 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
source='unix_privs.c',
autoproto='unix_privs.h',
- deps='UID_WRAPPER',
local_include=False,
)
-bld.SAMBA_LIBRARY('WRAP_XATTR',
- source='wrap_xattr.c',
- public_deps='attr',
- deps='talloc',
- local_include=False,
- private_library=True
- )
+bld.SAMBA_LIBRARY('wrap_xattr',
+ source='wrap_xattr.c',
+ public_deps='attr',
+ deps='talloc',
+ local_include=False,
+ private_library=True
+ )
bld.SAMBA_SUBSYSTEM('UTIL_TDB',
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 48afffb..a39f835 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -2,22 +2,22 @@
bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF',
source='nbtname.c',
- deps='talloc',
+ deps='talloc',
autoproto='nbtname.h'
)
bld.SAMBA_LIBRARY('LIBCLI_NBT',
- source='lmhosts.c nbtsocket.c namequery.c nameregister.c
namerefresh.c namerelease.c dns_hosts_file.c',
- public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY
samba_socket LIBSAMBA-UTIL',
- private_library=True
- )
+ source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c
namerelease.c dns_hosts_file.c',
+ public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY
samba_socket LIBSAMBA-UTIL',
+ private_library=True
+ )
bld.SAMBA_BINARY('nmblookup',
source='tools/nmblookup.c',
manpages='man/nmblookup.1',
- deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA
LIBNETIF LIBCLI_RESOLVE'
+ deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBCLI_NBT popt POPT_SAMBA
libnetif LIBCLI_RESOLVE'
)
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index f783f3a..5468d92 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,13 +10,13 @@ bld.SAMBA_LIBRARY('LIBWINBIND-CLIENT',
bld.SAMBA_BINARY('nsstest',
source='nsstest.c',
- deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG NSS_WRAPPER'
+ deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG'
)
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/source3/wscript_build b/source3/wscript_build
index 9ee2cbc..649b30e 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/credentials/wscript_build
b/source4/auth/credentials/wscript_build
index 9e81e8f..be004a8 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS',
source='credentials.c',
autoproto='credentials_proto.h',
public_headers='credentials.h',
- deps='LIBCRYPTO LIBSAMBA-ERRORS LIBEVENTS LIBCLI_AUTH LIBSECURITY',
+ deps='LIBCRYPTO LIBSAMBA-ERRORS libevents LIBCLI_AUTH LIBSECURITY',
)
bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index f70bebb..20d914c 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 LIBTSOCKET'
)
bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
source='pam_errors.c',
- deps='talloc'
+ deps='talloc'
)
diff --git a/source4/cldap_server/wscript_build
b/source4/cldap_server/wscript_build
index 85a9798..fbf3c7e 100644
--- a/source4/cldap_server/wscript_build
+++ b/source4/cldap_server/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('service_cldap',
source='cldap_server.c',
subsystem='service',
init_function='server_service_cldapd_init',
- deps='CLDAPD process_model LIBNETIF'
+ deps='CLDAPD process_model libnetif'
)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build
b/source4/dsdb/samdb/ldb_modules/wscript_build
index abac6f4..3f56ea3 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -28,7 +28,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
source='samba_dsdb.c',
subsystem='ldb',
init_function='LDB_MODULE(samba_dsdb)',
- deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS',
+ deps='SAMDB talloc libevents LIBNDR DSDB_MODULE_HELPERS',
internal_module=False,
)
@@ -38,7 +38,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
subsystem='ldb',
init_function='LDB_MODULE(samba_secrets)',
internal_module=False,
- deps='SAMDB talloc LIBEVENTS LIBNDR'
+ deps='SAMDB talloc libevents LIBNDR'
)
@@ -47,7 +47,7 @@ bld.SAMBA_MODULE('ldb_objectguid',
subsystem='ldb',
init_function='LDB_MODULE(objectguid)',
internal_module=False,
- deps='SAMDB talloc LIBEVENTS LIBNDR'
+ deps='SAMDB talloc libevents LIBNDR'
)
@@ -56,7 +56,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
subsystem='ldb',
init_function='LDB_MODULE(repl_meta_data)',
internal_module=False,
- deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR
DSDB_MODULE_HELPERS LIBSECURITY_SESSION'
+ deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR
DSDB_MODULE_HELPERS LIBSECURITY_SESSION'
)
@@ -65,7 +65,7 @@ bld.SAMBA_MODULE('ldb_dsdb_cache',
subsystem='ldb',
init_function='LDB_MODULE(dsdb_cache)',
internal_module=False,
- deps='SAMDB talloc LIBEVENTS'
+ deps='SAMDB talloc libevents'
)
@@ -74,7 +74,7 @@ bld.SAMBA_MODULE('ldb_schema_load',
subsystem='ldb',
init_function='LDB_MODULE(schema_load)',
internal_module=False,
- deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+ deps='SAMDB talloc libevents DSDB_MODULE_HELPERS'
)
@@ -83,7 +83,7 @@ bld.SAMBA_MODULE('ldb_schema_data',
subsystem='ldb',
init_function='LDB_MODULE(schema_data)',
internal_module=False,
- deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+ deps='SAMDB talloc libevents DSDB_MODULE_HELPERS'
)
--
Samba Shared Repository
