wafsamba: make it possible to pass bundled_name to SAMBA_LIBRARY()
authorStefan Metzmacher <metze@samba.org>
Fri, 16 Jan 2015 23:24:53 +0000 (00:24 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 19 Jan 2015 01:24:03 +0000 (02:24 +0100)
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10112

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
buildtools/wafsamba/wafsamba.py

index 82a9d6fcfe9e39f816de70d96853127281b75ba2..fb5934df44dfee095113c1e061ac5e90ea493f30 100644 (file)
@@ -130,6 +130,7 @@ def SAMBA_LIBRARY(bld, libname, source,
                   pyext=False,
                   target_type='LIBRARY',
                   bundled_extension=False,
+                  bundled_name=None,
                   link_name=None,
                   abi_directory=None,
                   abi_match=None,
@@ -223,7 +224,9 @@ def SAMBA_LIBRARY(bld, libname, source,
             raise Utils.WafError("public library '%s' must have header files" %
                        libname)
 
-    if target_type == 'PYTHON' or realname or not private_library:
+    if bundled_name is not None:
+        pass
+    elif target_type == 'PYTHON' or realname or not private_library:
         if keep_underscore:
             bundled_name = libname
         else: