From 91099d896bb6cc9aa8ca6ae509c2e20d5fa87a75 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 22 Feb 2011 09:19:49 +0100 Subject: s3-waf: make use of LIBCLI_CLDAP subsystem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit metze Autobuild-User: Günther Deschner Autobuild-Date: Wed Feb 23 10:17:01 CET 2011 on sn-devel-104 --- source3/wscript_build | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/source3/wscript_build b/source3/wscript_build index 425ca92d89..c2c9deb2d0 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -145,10 +145,6 @@ LIBSMB_SRC0 = ''' LIBSAMBA_SRC = '${LIBSMB_SRC0}' -CLDAP_SRC = '''libads/cldap.c - ../libcli/cldap/cldap.c - ../lib/util/idtree.c''' - TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c''' SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c''' @@ -815,8 +811,8 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI', vars=locals()) bld.SAMBA3_SUBSYSTEM('CLDAP', - source=CLDAP_SRC, - deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET', + source='libads/cldap.c', + deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET', vars=locals()) bld.SAMBA3_SUBSYSTEM('SECRETS3', @@ -1331,6 +1327,7 @@ if not bld.env.toplevel_build: bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3') bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3') bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT') + bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT') else: # dynconfig provides this in the toplevel build @@ -1358,6 +1355,7 @@ bld.RECURSE('../lib/async_req') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') bld.RECURSE('../libcli/ldap') +bld.RECURSE('../libcli/cldap') bld.RECURSE('../libcli/named_pipe_auth') bld.RECURSE('../libcli/netlogon') bld.RECURSE('../libcli/samsync') -- cgit