summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-12 22:56:44 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-12 23:13:30 +1000
commitc168e5ce507951c0e54e5a612b70fb82b2df3e63 (patch)
tree2ee3b4f34f03bca66fc537dbfa9158cfa45c2545
parentd12605c679cf4f2c5057c548de1210e7fa03a2f1 (diff)
downloadsamba-c168e5ce507951c0e54e5a612b70fb82b2df3e63.tar.gz
samba-c168e5ce507951c0e54e5a612b70fb82b2df3e63.tar.bz2
samba-c168e5ce507951c0e54e5a612b70fb82b2df3e63.zip
s4-ldb: enable waf build of ldb without ldap backend
this is useful for cross-compilation testing, where getting all the ldap deps installed can be hard
-rw-r--r--source4/lib/ldb/wscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 911eb77fb2..d796bc0011 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -44,7 +44,8 @@ def configure(conf):
implied_deps='replace talloc tdb tevent'):
conf.define('USING_SYSTEM_LDB', 1)
# we need this for the ldap backend
- conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h', mandatory=True)
+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h'):
+ conf.env.ENABLE_LDAP_BACKEND = True
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
@@ -133,7 +134,7 @@ def build(bld):
bld.SAMBA_MODULE('ldb_ldap', 'ldb_ldap/ldb_ldap.c',
init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)',
deps='talloc lber ldap',
- enabled=not s4_build,
+ enabled=bld.env.ENABLE_LDAP_BACKEND,
subsystem='LIBLDB')
# we're not currently linking against the ldap libs, but ldb.pc.in