summaryrefslogtreecommitdiff
path: root/lib/talloc
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-13 21:33:04 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-13 23:03:27 +1000
commitc10d267a7620d53e34f79c2514849cd82a47b9aa (patch)
treeeff77c4b1036a66a4f313819b744adeedafcbb4c /lib/talloc
parent483d059c8e08473c9c9b27025bfb80f0d6b89c4a (diff)
downloadsamba-c10d267a7620d53e34f79c2514849cd82a47b9aa.tar.gz
samba-c10d267a7620d53e34f79c2514849cd82a47b9aa.tar.bz2
samba-c10d267a7620d53e34f79c2514849cd82a47b9aa.zip
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 <abartlet@samba.org>
Diffstat (limited to 'lib/talloc')
-rw-r--r--lib/talloc/wscript9
1 files changed, 5 insertions, 4 deletions
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: