summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-22 23:07:58 +0100
committerGünther Deschner <gd@samba.org>2011-02-22 23:53:25 +0100
commit40dd6ce3ac63bb187dedc836c0bce14798b0ed8d (patch)
treeba7bdedc5f8e803191c3421000ce4617b659da10
parent8bca9df258527125e6b7ec9b9ad060cc0fdc3ddf (diff)
downloadsamba-40dd6ce3ac63bb187dedc836c0bce14798b0ed8d.tar.gz
samba-40dd6ce3ac63bb187dedc836c0bce14798b0ed8d.tar.bz2
samba-40dd6ce3ac63bb187dedc836c0bce14798b0ed8d.zip
Revert "s3-waf: make use of LIBCLI_CLDAP subsystem"
Metze, we need to cleanup deps to idtree and cli-ldap first. Guenther This reverts commit ac4497edae2800c3fc7c40f0e538b936f1965a75. Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Tue Feb 22 23:53:25 CET 2011 on sn-devel-104
-rw-r--r--source3/wscript_build9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 73cc20d576..0d82cb4186 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -168,6 +168,10 @@ 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'''
@@ -841,8 +845,8 @@ bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
vars=locals())
bld.SAMBA3_SUBSYSTEM('CLDAP',
- source='libads/cldap.c',
- deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBCLI_CLDAP LIBTSOCKET',
+ source=CLDAP_SRC,
+ deps='LIBCLI_LDAP_MESSAGE LIBCLI_LDAP_NDR LIBTSOCKET',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SECRETS3',
@@ -1385,7 +1389,6 @@ 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')