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 --- lib/talloc/wscript | 9 +++++---- lib/tdb/wscript | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/talloc/wscript b/lib/talloc/wscript index bd47be8eaa..f6170effe4 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -33,12 +33,13 @@ def set_options(opt): def configure(conf): conf.RECURSE('lib/replace') - if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) - conf.env.standalone_talloc = conf.IN_LAUNCH_DIR() + if not conf.env.standalone_talloc: + if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, + implied_deps='replace'): + conf.define('USING_SYSTEM_TALLOC', 1) + conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 if conf.env.standalone_talloc: diff --git a/lib/tdb/wscript b/lib/tdb/wscript index c5706a2f16..de62d4a758 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -30,11 +30,13 @@ def set_options(opt): def configure(conf): conf.RECURSE('lib/replace') - if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TDB', 1) - conf.env.standalone_tdb = conf.IN_LAUNCH_DIR() + + if not conf.env.standalone_tdb: + if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, + implied_deps='replace'): + conf.define('USING_SYSTEM_TDB', 1) + conf.env.disable_python = getattr(Options.options, 'disable_python', False) if conf.env.standalone_tdb: @@ -93,7 +95,6 @@ def build(bld): if bld.env.standalone_tdb: bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.env.TALLOC_VERSION = VERSION bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) -- cgit