wafsamba: allow --bundled-libraries=NONE,popt

This will bundle only 'popt'.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 68dbc7437d4c864023819a05418b02d30eb35279..b936cdb01b89288124a6051da7129f71951f3bbf 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -70,6 +70,8 @@ def minimum_library_version(conf, libname, default):
 
 @conf
 def LIB_MAY_BE_BUNDLED(conf, libname):
+    if libname in conf.env.BUNDLED_LIBS:
+        return True
     if '!%s' % libname in conf.env.BUNDLED_LIBS:
         return False
     if 'NONE' in conf.env.BUNDLED_LIBS: