[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  2dd696a s3-waf: Create a subsystem for SERVER_MUTEX.
       via  022c560 s3-waf: Add missing dependency of ntlmssp to wbclient.
       via  7c723c0 s3-waf: Add missing dependency of pdb_wbc_sam to wbclient.
      from  5bdadd1 build: Add missing dependencies on popt

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2dd696a5dfc74a12528dd153ce5e9ba33e2e5980
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Jan 27 10:40:29 2012 +0100

    s3-waf: Create a subsystem for SERVER_MUTEX.
    
    Autobuild-User: Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date: Fri Jan 27 12:55:01 CET 2012 on sn-devel-104

commit 022c560cea0343bd754011cd3f4bbe1946fda0ef
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Jan 27 10:41:46 2012 +0100

    s3-waf: Add missing dependency of ntlmssp to wbclient.

commit 7c723c0529f6d5c10d3d69d8e186d57e4934c210
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Jan 26 11:36:07 2012 +0100

    s3-waf: Add missing dependency of pdb_wbc_sam to wbclient.

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/wscript_build |    2 +-
 source3/wscript_build        |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 662cfd2..a8b79fd 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -41,7 +41,7 @@ bld.SAMBA3_MODULE('pdb_smbpasswd',
 bld.SAMBA3_MODULE('pdb_wbc_sam',
                  subsystem='pdb',
                  source=PDB_WBC_SAM_SRC,
-                 deps='samba-util',
+                 deps='samba-util wbclient',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_wbc_sam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 7ae60be..6d856a5 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -223,7 +223,7 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
                 lib/util_unixsids.c passdb/lookup_sid.c
                 passdb/login_cache.c
                 passdb/account_pol.c ${PRIVILEGES_SRC}
-                lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}
+                lib/util_nscd.c lib/winbind_util.c
                 passdb/pdb_util.c passdb/pdb_interface.c
                 passdb/pdb_ldap_schema.c
                 passdb/pdb_secrets.c'''
@@ -725,7 +725,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
 
 bld.SAMBA3_LIBRARY('pdb',
                    source=PASSDB_SRC,
-                   deps='SECRETS3 GROUPDB wbclient LIBCLI_AUTH flag_mapping',
+                   deps='SECRETS3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping',
                    private_library=True,
                    public_headers='''
 				include/passdb.h
@@ -733,6 +733,9 @@ bld.SAMBA3_LIBRARY('pdb',
 				passdb/lookup_sid.h''',
                    vars=locals())
 
+bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
+                     source=SERVER_MUTEX_SRC)
+
 bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
                     source=PARAM_UTIL_SRC)
 
@@ -839,7 +842,7 @@ bld.SAMBA3_LIBRARY('smbd_shim',
 
 bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
                     source=LIBNTLMSSP_SRC,
-                    deps='NDR_NTLMSSP NTLMSSP_COMMON',
+                    deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('auth_generic',
@@ -889,7 +892,7 @@ bld.SAMBA3_LIBRARY('ads',
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
-                    deps='ndr-krb5pac KRB5_WRAP',
+                    deps='SERVER_MUTEX ndr-krb5pac KRB5_WRAP',
 		    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',


-- 
Samba Shared Repository