From c19e5a0386b7656e8b228720f4d565f29efdbc6c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Mar 2014 10:48:56 +0100 Subject: wafsamba: allow --bundled-libraries=NONE,popt This will bundle only 'popt'. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_bundled.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 68dbc7437d4..b936cdb01b8 100644 --- 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: -- cgit