summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-11 12:09:25 +0100
committerGünther Deschner <gd@samba.org>2011-02-11 13:08:38 +0100
commit8015514c5b19acf37e6121eefdc8464fb89e60c2 (patch)
tree13d3916cf45db90878f415c0bcde885ef3952a28
parent1bad50f648fff0a145d56bf3094c14b6e0845fa2 (diff)
downloadsamba-8015514c5b19acf37e6121eefdc8464fb89e60c2.tar.gz
samba-8015514c5b19acf37e6121eefdc8464fb89e60c2.tar.bz2
samba-8015514c5b19acf37e6121eefdc8464fb89e60c2.zip
s3-waf: use bld.env.HAVE_LDAP in some more places, hopefully fixes the builds w/o ldap.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Fri Feb 11 13:08:38 CET 2011 on sn-devel-104
-rw-r--r--source3/passdb/wscript_build2
-rw-r--r--source3/winbindd/wscript_build20
2 files changed, 12 insertions, 10 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 4a41fe5238..be381c815f 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -23,7 +23,7 @@ bld.SAMBA_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'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('pdb_ads',
subsystem='pdb',
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index fd4bdad422..bb2ae3f52f 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -28,7 +28,8 @@ bld.SAMBA_SUBSYSTEM('idmap',
bld.SAMBA_SUBSYSTEM('IDMAP_ADEX',
source=IDMAP_ADEX_SRC,
- vars=locals())
+ vars=locals(),
+ enabled=bld.env.HAVE_LDAP)
bld.SAMBA_SUBSYSTEM('IDMAP_HASH',
source=IDMAP_HASH_SRC,
@@ -36,7 +37,8 @@ bld.SAMBA_SUBSYSTEM('IDMAP_HASH',
bld.SAMBA_SUBSYSTEM('IDMAP_AD',
source=IDMAP_AD_SRC,
- vars=locals())
+ vars=locals(),
+ enabled=bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('idmap_ad',
subsystem='idmap',
@@ -44,7 +46,7 @@ bld.SAMBA_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'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad' and bld.env.HAVE_LDAP))
bld.SAMBA_MODULE('idmap_rid',
subsystem='idmap',
@@ -65,7 +67,7 @@ bld.SAMBA_MODULE('idmap_ldap',
source=IDMAP_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('idmap_nss',
subsystem='idmap',
@@ -102,7 +104,7 @@ bld.SAMBA_MODULE('idmap_adex',
deps='IDMAP_ADEX',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex') and bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('idmap_autorid',
subsystem='idmap',
@@ -132,7 +134,7 @@ bld.SAMBA_MODULE('nss_info_adex',
deps='IDMAP_ADEX',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex') and bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('nss_info_hash',
subsystem='nss_info',
@@ -148,7 +150,7 @@ bld.SAMBA_MODULE('nss_info_rfc2307',
deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('nss_info_sfu20',
subsystem='nss_info',
@@ -156,7 +158,7 @@ bld.SAMBA_MODULE('nss_info_sfu20',
deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)
bld.SAMBA_MODULE('nss_info_sfu',
subsystem='nss_info',
@@ -164,4 +166,4 @@ bld.SAMBA_MODULE('nss_info_sfu',
deps='IDMAP_AD',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad') and bld.env.HAVE_LDAP)