diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-03-14 10:47:30 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-02 09:03:41 +0200 |
| commit | 9a8e35a04919093b7423823e8eadd23f311493d2 (patch) | |
| tree | 7f0c41f75fafba8df9cb848a33fc0a67849128fe /buildtools | |
| parent | 6ae4121da56e4a80d71c88984c17e7cc2b9d0f62 (diff) | |
| download | samba-9a8e35a04919093b7423823e8eadd23f311493d2.tar.gz | |
wafsamba: simplify LIB_MAY_BE_BUNDLED()
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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 97ad4aa365b..1ca9b3ae50d 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -70,9 +70,11 @@ def minimum_library_version(conf, libname, default): @conf def LIB_MAY_BE_BUNDLED(conf, libname): - return ('NONE' not in conf.env.BUNDLED_LIBS and - '!%s' % libname not in conf.env.BUNDLED_LIBS) - + if '!%s' % libname in conf.env.BUNDLED_LIBS: + return False + if 'NONE' in conf.env.BUNDLED_LIBS: + return False + return True @conf def LIB_MUST_BE_BUNDLED(conf, libname): |