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:41 +0200 |
| commit | c19e5a0386b7656e8b228720f4d565f29efdbc6c (patch) | |
| tree | 1574a1d1886718599508fab9ecbff0f34b410a01 /buildtools | |
| parent | ef380bb2a934f608f64bf8752df12bf00bc2a8fd (diff) | |
| download | samba-c19e5a0386b7656e8b228720f4d565f29efdbc6c.tar.gz samba-c19e5a0386b7656e8b228720f4d565f29efdbc6c.tar.xz samba-c19e5a0386b7656e8b228720f4d565f29efdbc6c.zip | |
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>
Diffstat (limited to 'buildtools')
| -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 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: |