From cc765baa64c51de3c229697a130d691f336ac2f3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Mar 2014 10:48:56 +0100 Subject: wafsamba: allow --bundled-libraries=ALL,!popt This will not bundle 'popt', but everything else. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_bundled.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'buildtools/wafsamba') diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index b936cdb01b8..23a0f092608 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -82,6 +82,8 @@ def LIB_MAY_BE_BUNDLED(conf, libname): def LIB_MUST_BE_BUNDLED(conf, libname): if libname in conf.env.BUNDLED_LIBS: return True + if '!%s' % libname in conf.env.BUNDLED_LIBS: + return False if 'ALL' in conf.env.BUNDLED_LIBS: return True return False -- cgit