summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/wscript3
-rw-r--r--source3/wscript_build8
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/wscript b/source3/wscript
index cbc7cd325d..3957fcab55 100644
--- 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 cb5cdcbf45..a201979ba8 100644
--- 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,