The branch, master has been updated via fe2071c build: Fix enabled handling for HAVE_LDAP, we need to use bld.CONFIG_SET via b8eaa57 build: Try not build with LDAP if we do not have ldap.h from cb157e1 s4:dns.py: reproducer for (bug #9184)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit fe2071cd3bae655b9aa7908059f0e19520e2db90 Author: Andrew Bartlett <abart...@samba.org> Date: Fri Sep 21 22:27:24 2012 -0700 build: Fix enabled handling for HAVE_LDAP, we need to use bld.CONFIG_SET Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Sat Sep 22 09:09:17 CEST 2012 on sn-devel-104 commit b8eaa57a100818d337c85ac42828801a59062587 Author: Andrew Bartlett <abart...@samba.org> Date: Fri Sep 21 21:57:22 2012 -0700 build: Try not build with LDAP if we do not have ldap.h ----------------------------------------------------------------------- Summary of changes: source3/passdb/wscript_build | 2 +- source3/winbindd/wscript_build | 12 ++++++------ source3/wscript | 2 +- source3/wscript_build | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index d26afc2..03a0df4 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 302b9ee..0d826f0 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 b/source3/wscript index d0e76f3..23ea327 100644 --- a/source3/wscript +++ b/source3/wscript @@ -541,7 +541,7 @@ msg.msg_acctrightslen = sizeof(fd); conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '2') # last but not least, if ldap_init() exists, we want to use ldap - if conf.CONFIG_SET('HAVE_LDAP_INIT'): + if conf.CONFIG_SET('HAVE_LDAP_INIT') and conf.CONFIG_SET('HAVE_LDAP_H'): conf.DEFINE('HAVE_LDAP', '1') conf.DEFINE('LDAP_DEPRECATED', '1') conf.env['HAVE_LDAP'] = '1' diff --git a/source3/wscript_build b/source3/wscript_build index 7e39ec3..74cc983 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_*', -- Samba Shared Repository