summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-05-31 13:55:17 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-05-31 13:57:03 +0200
commit8c017022dbb78966589fa98e03dea01d91d003b0 (patch)
tree52ff37185cb2878a5bc8019c331edf2b575e52fa
parent151e239bcf2860411527a953d627b2d724c0a57e (diff)
downloadsamba-8c017022dbb78966589fa98e03dea01d91d003b0.tar.gz
samba-8c017022dbb78966589fa98e03dea01d91d003b0.tar.bz2
samba-8c017022dbb78966589fa98e03dea01d91d003b0.zip
talloc: Don't set is_bundled for standalone build.
-rw-r--r--lib/talloc/wscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 45886a553e..be80b27a66 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -60,7 +60,8 @@ def build(bld):
abi_file='ABI/talloc-%s.sigs' % VERSION,
abi_match='talloc* _talloc*',
hide_symbols=True,
- vnum=VERSION, is_bundled=True,
+ vnum=VERSION,
+ is_bundled=not bld.env.standalone_talloc,
manpages='talloc.3')
# should we also install the symlink to libtalloc1.so here?
@@ -68,7 +69,8 @@ def build(bld):
'compat/talloc_compat1.c',
deps='talloc',
enabled = bld.env.TALLOC_COMPAT1,
- vnum=VERSION, is_bundled=True)
+ vnum=VERSION,
+ is_bundled=not bld.env.standalone_talloc)
if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
# s4 already has the talloc testsuite builtin to smbtorture