diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-03-14 10:48:12 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-04-02 09:03:41 +0200 |
| commit | ef380bb2a934f608f64bf8752df12bf00bc2a8fd (patch) | |
| tree | fa92169306cfc017e6d49dcc7b2e70353789b405 /buildtools | |
| parent | 9a8e35a04919093b7423823e8eadd23f311493d2 (diff) | |
| download | samba-ef380bb2a934f608f64bf8752df12bf00bc2a8fd.tar.gz samba-ef380bb2a934f608f64bf8752df12bf00bc2a8fd.tar.xz samba-ef380bb2a934f608f64bf8752df12bf00bc2a8fd.zip | |
wafsamba: simplify LIB_MUST_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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 1ca9b3ae50d..68dbc7437d4 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -78,8 +78,11 @@ def LIB_MAY_BE_BUNDLED(conf, libname): @conf def LIB_MUST_BE_BUNDLED(conf, libname): - return ('ALL' in conf.env.BUNDLED_LIBS or - libname in conf.env.BUNDLED_LIBS) + if libname in conf.env.BUNDLED_LIBS: + return True + if 'ALL' in conf.env.BUNDLED_LIBS: + return True + return False @conf def LIB_MUST_BE_PRIVATE(conf, libname): |