[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  7747575... s3-waf: Fix up smbclient dependencies
       via  6331d7f... s3-waf: Fixed dependencies of the the krbclient subsystem.
       via  6c7c81a... s3-waf: Fixed dependencies of the the avahi subsystem.
      from  74fad25... s4:ldb_msg_element_compare - fix typo in comment

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


- Log -----------------------------------------------------------------
commit 7747575ef485a4d8cfe2fe9ada18b5b009074a0f
Author: Kai Blin <kai at samba.org>
Date:   Wed Jun 2 11:28:54 2010 +0200

    s3-waf: Fix up smbclient dependencies

commit 6331d7f90d411f18b760f6525a4534a3c663445f
Author: Kai Blin <kai at samba.org>
Date:   Wed Jun 2 11:21:18 2010 +0200

    s3-waf: Fixed dependencies of the the krbclient subsystem.

commit 6c7c81a8f286a10366a0d2cbb36c00272d6d1d47
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jun 2 11:19:36 2010 +0200

    s3-waf: Fixed dependencies of the the avahi subsystem.

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

Summary of changes:
 source3/wscript_build |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index ab578ff..ab61d80 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -782,8 +782,7 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c ${RPC_CLIENT_SRC}
                  ../librpc/rpc/binding.c client/dnsbrowse.c
                  ${RPC_CLIENT_SRC1} ${RPC_PARSE_SRC2}'''
 
-CLIENT_SRC = '''${CLIENT_SRC1} ${PARAM_SRC}
-	        ${KRBCLIENT_SRC} ${LIBMSRPC_GEN_SRC}
+CLIENT_SRC = '''${CLIENT_SRC1} ${LIBMSRPC_GEN_SRC}
                 ${READLINE_SRC} ${DISPLAY_SEC_SRC}'''
 
 
@@ -855,6 +854,7 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
 
 bld.SAMBA_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
+                    deps='avahi-common avahi-client',
                     enabled=bld.env.with_avahi)
 
 bld.SAMBA_SUBSYSTEM('GROUPDB',
@@ -883,6 +883,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 
 bld.SAMBA_SUBSYSTEM('KRBCLIENT',
                     source=KRBCLIENT_SRC,
+                    deps='krb5 gssapi gssapi_krb5',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBS',
@@ -957,7 +958,7 @@ bld.SAMBA_BINARY('web/swat',
 bld.SAMBA_BINARY('smbclient',
                  source=CLIENT_SRC,
                  deps='''talloc tdb cap POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
-                 PARAM_WITHOUT_REG LIBWBCLIENT DYNCONFIG''',
+                 PARAM_WITHOUT_REG LIBWBCLIENT DYNCONFIG PARAM KRBCLIENT''',
                  vars=locals())
 
 bld.SAMBA_BINARY('wbinfo',


-- 
Samba Shared Repository