diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-21 22:27:24 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-22 09:09:16 +0200 |
| commit | fe2071cd3bae655b9aa7908059f0e19520e2db90 (patch) | |
| tree | 89038fc686d4b2f4970a4198b45f757413ca8453 | |
| parent | b8eaa57a100818d337c85ac42828801a59062587 (diff) | |
| download | samba-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
| -rw-r--r-- | source3/passdb/wscript_build | 2 | ||||
| -rw-r--r-- | source3/winbindd/wscript_build | 12 | ||||
| -rwxr-xr-x | source3/wscript_build | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index d26afc2a70..03a0df4174 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -19,7 +19,7 @@ bld.SAMBA3_MODULE('pdb_ldap', source=PDB_LDAP_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP) + enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.CONFIG_SET('HAVE_LDAP')) bld.SAMBA3_MODULE('pdb_smbpasswd', subsystem='pdb', 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")) diff --git a/source3/wscript_build b/source3/wscript_build index 7e39ec3998..74cc983439 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -740,7 +740,7 @@ bld.SAMBA3_LIBRARY('smbldaphelper', source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c', deps='smbldap secrets3', allow_undefined_symbols=True, - enabled=bld.env.HAVE_LDAP, + enabled=bld.CONFIG_SET('HAVE_LDAP'), private_library=True) bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX', @@ -890,7 +890,7 @@ bld.SAMBA3_LIBRARY('smbldap', source=SMBLDAP_SRC, deps='ldap lber samba-util param', vars=locals(), - enabled=bld.env.HAVE_LDAP, + enabled=bld.CONFIG_SET("HAVE_LDAP"), private_library=False, abi_directory='lib/ABI', abi_match='smbldap_*', |