diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-03-14 10:48:56 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-02 09:03:42 +0200 |
| commit | cc765baa64c51de3c229697a130d691f336ac2f3 (patch) | |
| tree | ae91b92b1d12f83216276d4c863f38efef944edf | |
| parent | c19e5a0386b7656e8b228720f4d565f29efdbc6c (diff) | |
| download | samba-cc765baa64c51de3c229697a130d691f336ac2f3.tar.gz samba-cc765baa64c51de3c229697a130d691f336ac2f3.tar.xz samba-cc765baa64c51de3c229697a130d691f336ac2f3.zip | |
wafsamba: allow --bundled-libraries=ALL,!popt
This will not bundle 'popt', but everything else.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 2 |
1 files changed, 2 insertions, 0 deletions
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 |