summaryrefslogtreecommitdiff
path: root/lib/talloc
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-12-09 21:58:20 +1100
committerAndrew Tridgell <tridge@samba.org>2010-12-09 12:47:40 +0100
commit57f2f1d72a70a80e61a2ed6f1abc63a177a590ab (patch)
treef034ee148b05cc9f59c9f96128c165d363009a5b /lib/talloc
parentca247bee2fbd444dfd1abe94c83472ac8e3c1ad1 (diff)
downloadsamba-57f2f1d72a70a80e61a2ed6f1abc63a177a590ab.tar.gz
samba-57f2f1d72a70a80e61a2ed6f1abc63a177a590ab.tar.bz2
samba-57f2f1d72a70a80e61a2ed6f1abc63a177a590ab.zip
waf: remove the restriction that private libraries must not have a vnum
we need the vnum for ABI checking for public libraries built as private libraries when bundled Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Thu Dec 9 12:47:41 CET 2010 on sn-devel-104
Diffstat (limited to 'lib/talloc')
-rw-r--r--lib/talloc/wscript6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 3d359c1281..a23532a189 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -76,7 +76,6 @@ def build(bld):
bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION)
bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h')
private_library = False
- vnum = VERSION
# should we also install the symlink to libtalloc1.so here?
bld.SAMBA_LIBRARY('talloc-compat1-%s' % (VERSION),
@@ -89,7 +88,6 @@ def build(bld):
bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION)
else:
private_library = True
- vnum = None
if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'):
@@ -99,7 +97,7 @@ def build(bld):
abi_directory='ABI',
abi_match='talloc* _talloc*',
hide_symbols=True,
- vnum=vnum,
+ vnum=VERSION,
private_library=private_library,
manpages='talloc.3')
@@ -111,7 +109,7 @@ def build(bld):
abi_directory='ABI',
abi_match='py* Py*',
pyext=True,
- vnum=vnum,
+ vnum=VERSION,
private_library=private_library,
)
bld.INSTALL_FILES('${INCLUDEDIR}', 'pytalloc.h')