summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-08-21 02:09:14 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-08-21 03:22:05 +0200
commit12e1fdf0899c8f9176f4a7e789faa2758c4eaa70 (patch)
tree237311dafdb5746ef6d14fbfa428ff3336d13458 /buildtools
parent2b4028359135058700456eb3720ece105611425f (diff)
downloadsamba-12e1fdf0899c8f9176f4a7e789faa2758c4eaa70.tar.gz
samba-12e1fdf0899c8f9176f4a7e789faa2758c4eaa70.tar.bz2
samba-12e1fdf0899c8f9176f4a7e789faa2758c4eaa70.zip
wafsamba: Require public libraries to have a pc file specified, or explicitly specified that they don't need one.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/wafsamba.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 3858770a6f..85ff732f14 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -191,13 +191,19 @@ def SAMBA_LIBRARY(bld, libname, source,
link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
# we don't want any public libraries without version numbers
- if not private_library and vnum is None and soname is None and target_type != 'PYTHON' and not realname:
- raise Utils.WafError("public library '%s' must have a vnum" % libname)
+ if (not private_library and target_type != 'PYTHON' and not realname):
+ if vnum is None and soname is None:
+ raise Utils.WafError("public library '%s' must have a vnum" %
+ libname)
+ if pc_files is None:
+ raise Utils.WafError("public library '%s' must have pkg-config file" %
+ libname)
if target_type == 'PYTHON' or realname or not private_library:
bundled_name = libname.replace('_', '-')
else:
- bundled_name = PRIVATE_NAME(bld, libname, bundled_extension, private_library)
+ bundled_name = PRIVATE_NAME(bld, libname, bundled_extension,
+ private_library)
ldflags = TO_LIST(ldflags)
@@ -273,7 +279,8 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is not None:
bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
- if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+ if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
+ bld.env['XSLTPROC_MANPAGES']):
bld.MANPAGES(manpages)