From c10d267a7620d53e34f79c2514849cd82a47b9aa Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 13 Apr 2010 21:33:04 +1000 Subject: s4-waf: don't try to use the system lib for the library build when building library FOO, don't try to find the system library FOO Pair-Programmed-With: Andrew Bartlett --- source4/lib/ldb/wscript | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source4/lib/ldb/wscript') diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index d796bc0011..ea0219ff4b 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -37,12 +37,14 @@ def configure(conf): s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4 + conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() if not s4_build: - 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 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) # we need this for the ldap backend if conf.CHECK_FUNCS_IN('ber_flush ldap_open', 'lber ldap', headers='lber.h ldap.h'): conf.env.ENABLE_LDAP_BACKEND = True -- cgit