From c59da6e9a5cd177aed8fac38bd170979339bae7f Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Fri, 30 Apr 2010 02:07:28 -0600
Subject: [PATCH] s3-waf: Fix the build --with-ldap

The LDAP source files as set by configure weren't detected correctly in the wscript_build
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
---
 source3/wscript_build | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/source3/wscript_build b/source3/wscript_build
index 33431aa056d..fb8452ae0b5 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -10,6 +10,9 @@ TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
 
 TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
 
+SMBLDAP = bld.env.SMBLDAP
+SMBLDAPUTIL = bld.env.SMBLDAPUTIL
+
 SMBLDAP_SRC = '''${SMBLDAP} ${SMBLDAPUTIL}'''
 
 VERSION_SRC = '''lib/version.c'''
@@ -129,10 +132,6 @@ PTHREADPOOL_SRC = ''
 
 AUTH_STATIC = ''
 
-SMBLDAP = ''
-
-SMBLDAPUTIL = ''
-
 LIBREPLACE_SRCS = ''
 
 SOCKET_WRAPPER_SRCS = ''
@@ -911,14 +910,14 @@ bld.SAMBA_BINARY('smbd/smbd',
 bld.SAMBA_BINARY('nmbd/nmbd',
                  source=NMBD_SRC,
                  deps='''talloc tdb tevent z cap resolv LIBWBCLIENT popt dl
-                 NSS_WRAPPER DYNCONFIG PASSDB LDB PARAM LIB_NONSMBD LIBSMB''',
+                 NSS_WRAPPER DYNCONFIG PASSDB LDB ldap PARAM LIB_NONSMBD LIBSMB''',
                  includes='lib ../lib/tdb/include',
                  vars=locals())
 
 bld.SAMBA_BINARY('winbindd/winbindd',
                  source=WINBINDD_SRC,
                  deps='''talloc tdb tevent cap dl popt DYNCONFIG z NSS_WRAPPER
-                 LIBWBCLIENT PASSDB resolv LDB PARAM LIB_NONSMBD''',
+                 LIBWBCLIENT PASSDB ldap resolv LDB PARAM LIB_NONSMBD''',
                  includes='lib',
                  enabled=(bld.env.WITH_WINBIND == 1),
                  vars=locals())
@@ -926,14 +925,14 @@ bld.SAMBA_BINARY('winbindd/winbindd',
 bld.SAMBA_BINARY('wbinfo',
                  source=WBINFO_SRC,
                  deps='''talloc LIBWBCLIENT popt DYNCONFIG tevent tdb cap
-                 NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
+                 NSS_WRAPPER ASN1_UTIL LIBTSOCKET PASSDB ldap PARAM LIB_NONSMBD
                  LIBSAMBA''',
                  includes='lib ../lib/tdb/include',
                  vars=locals())
 
 bld.SAMBA_BINARY('testparm',
                  source=TESTPARM_SRC,
-                 deps='''talloc tdb tevent popt DYNCONFIG cap NSS_WRAPPER
+                 deps='''talloc tdb tevent popt DYNCONFIG ldap cap NSS_WRAPPER
                  LIBWBCLIENT ASN1_UTIL LIBTSOCKET PASSDB PARAM LIB_NONSMBD
                  LIBSMB_ERR''',
                  vars=locals())
-- 
2.11.4.GIT