summaryrefslogtreecommitdiff
path: root/lib/talloc/wscript
diff options
context:
space:
mode:
Diffstat (limited to 'lib/talloc/wscript')
-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: