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 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/talloc') 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: -- cgit