s3-waf: rework the way SMBLDAP subsystem is built a little.

Guenther

diff --git a/source3/wscript b/source3/wscript
index cbc7cd325dcd4193e2d87c011df607f7f8f25f8a..3957fcab559d9a3be431f9b615b6ad4bb9b8579d 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -572,8 +572,7 @@ msg.msg_acctrightslen = sizeof(fd);
         if conf.CONFIG_SET('HAVE_LDAP_INIT'):
             conf.DEFINE('HAVE_LDAP', '1')
             conf.DEFINE('LDAP_DEPRECATED', '1')
-            conf.env['SMBLDAP'] = 'lib/smbldap.c'
-            conf.env['SMBLDAPUTIL'] = 'lib/smbldap_util.c'
+            conf.env['HAVE_LDAP'] = '1'
     else:
         conf.SET_TARGET_TYPE('ldap', 'EMPTY')
         conf.SET_TARGET_TYPE('lber', 'EMPTY')

diff --git a/source3/wscript_build b/source3/wscript_build
index cb5cdcbf452b159e4ccc1b6e22ea5ef3231fcf06..a201979ba8b132eecc2150d29b05a0b759d98326 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -11,10 +11,7 @@ TDB_LIB_SRC = '''
 
 TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
 
-SMBLDAP = bld.env.SMBLDAP or ""
-SMBLDAPUTIL = bld.env.SMBLDAPUTIL or ""
-
-SMBLDAP_SRC = '''${SMBLDAP} ${SMBLDAPUTIL}'''
+SMBLDAP_SRC = '''lib/smbldap.c lib/smbldap_util.c'''
 
 VERSION_SRC = '''lib/version.c'''
 
@@ -880,7 +877,8 @@ bld.SAMBA_SUBSYSTEM('SECRETS',
 bld.SAMBA_SUBSYSTEM('SMBLDAP',
                     source=SMBLDAP_SRC,
                     deps='ldap lber',
-                    vars=locals())
+                    vars=locals(),
+                    enabled=bld.env.HAVE_LDAP)
 
 bld.SAMBA_SUBSYSTEM('LIBADS',
                     source=LIBADS_SRC,