summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-09-21 22:27:24 -0700
committerAndrew Bartlett <abartlet@samba.org>2012-09-22 09:09:16 +0200
commitfe2071cd3bae655b9aa7908059f0e19520e2db90 (patch)
tree89038fc686d4b2f4970a4198b45f757413ca8453 /source3/winbindd
parentb8eaa57a100818d337c85ac42828801a59062587 (diff)
downloadsamba-fe2071cd3bae655b9aa7908059f0e19520e2db90.tar.gz
samba-fe2071cd3bae655b9aa7908059f0e19520e2db90.tar.bz2
samba-fe2071cd3bae655b9aa7908059f0e19520e2db90.zip
build: Fix enabled handling for HAVE_LDAP, we need to use bld.CONFIG_SET
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sat Sep 22 09:09:17 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/wscript_build12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 302b9ee6a3..0d826f0f3d 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -32,7 +32,7 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
source=IDMAP_AD_SRC,
deps='ads nss_info',
vars=locals(),
- enabled=bld.env.HAVE_LDAP)
+ enabled=bld.CONFIG_SET("HAVE_LDAP"))
bld.SAMBA3_MODULE('idmap_ad',
subsystem='idmap',
@@ -41,7 +41,7 @@ bld.SAMBA3_MODULE('idmap_ad',
deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
bld.SAMBA3_MODULE('idmap_rid',
subsystem='idmap',
@@ -65,7 +65,7 @@ bld.SAMBA3_MODULE('idmap_ldap',
deps='smbldap smbldaphelper pdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.env.HAVE_LDAP)
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.CONFIG_SET("HAVE_LDAP"))
bld.SAMBA3_MODULE('idmap_nss',
subsystem='idmap',
@@ -143,7 +143,7 @@ bld.SAMBA3_MODULE('nss_info_rfc2307',
allow_undefined_symbols=True,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
bld.SAMBA3_MODULE('nss_info_sfu20',
subsystem='nss_info',
@@ -152,7 +152,7 @@ bld.SAMBA3_MODULE('nss_info_sfu20',
allow_undefined_symbols=True,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))
bld.SAMBA3_MODULE('nss_info_sfu',
subsystem='nss_info',
@@ -161,4 +161,4 @@ bld.SAMBA3_MODULE('nss_info_sfu',
allow_undefined_symbols=True,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.CONFIG_SET("HAVE_LDAP"))