From cd2dd331032895259e0875c717e8d9f5e6de301f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 31 May 2010 04:48:00 +0200 Subject: ldb: Support building with system ldb library --- source4/lib/ldb/wscript | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index a2855dcf42..02820737dc 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -39,19 +39,18 @@ def configure(conf): conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() - if not s4_build: - if not conf.env.standalone_ldb: - if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, - onlyif='talloc tdb tevent', - implied_deps='replace talloc tdb tevent'): - conf.define('USING_SYSTEM_LDB', 1) - - if conf.env.standalone_ldb: - conf.find_program('xsltproc', var='XSLTPROC') - - # we need this for the ldap backend - if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): - conf.env.ENABLE_LDAP_BACKEND = True + if not conf.env.standalone_ldb: + if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, + onlyif='talloc tdb tevent', + implied_deps='replace talloc tdb tevent'): + conf.define('USING_SYSTEM_LDB', 1) + + if conf.env.standalone_ldb: + conf.find_program('xsltproc', var='XSLTPROC') + + # we need this for the ldap backend + if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): + conf.env.ENABLE_LDAP_BACKEND = True conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True) -- cgit