From ef380bb2a934f608f64bf8752df12bf00bc2a8fd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Mar 2014 10:48:12 +0100 Subject: wafsamba: simplify LIB_MUST_BE_BUNDLED() Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- buildtools/wafsamba/samba_bundled.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'buildtools') 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): -- cgit