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

diff --git a/source3/wscript_build b/source3/wscript_build
index 73cc20d576fb2fd7b6dd09ba209bdf0828b12f9a..0d82cb4186dfcde88d7ec306652b7db40e5685a4 100644 (file)
--- 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')