git.samba.org
/
kai
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a8e35a
)
wafsamba: simplify LIB_MUST_BE_BUNDLED()
author
Stefan Metzmacher
<metze@samba.org>
Fri, 14 Mar 2014 09:48:12 +0000
(10:48 +0100)
committer
Andrew Bartlett
<abartlet@samba.org>
Wed, 2 Apr 2014 07:03:41 +0000
(09:03 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
buildtools/wafsamba/samba_bundled.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index 1ca9b3ae50d791881e438f3243335214681dcbdf..68dbc7437d4c864023819a05418b02d30eb35279 100644
(file)
--- 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):