git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4078b64
)
s4-waf: Only show minversion when there was a minimum version specified.
author
Jelmer Vernooij
<jelmer@samba.org>
Tue, 25 Jan 2011 01:15:49 +0000
(17:15 -0800)
committer
Jelmer Vernooij
<jelmer@samba.org>
Tue, 25 Jan 2011 01:15:49 +0000
(17:15 -0800)
buildtools/wafsamba/samba_bundled.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index 2e3e1300e32ec101285e6573cd3e8b40782659f5..39edad060d906cd3e059529ff63b98f7766a8ed8 100644
(file)
--- a/
buildtools/wafsamba/samba_bundled.py
+++ b/
buildtools/wafsamba/samba_bundled.py
@@
-122,10
+122,14
@@
def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
minversion = minimum_library_version(conf, libname, minversion)
+ msg = 'Checking for system %s' % libname
+ if minversion != '0.0.0':
+ msg += ' >= %s' % minversion
+
# try pkgconfig first
if (conf.check_cfg(package=libname,
args='"%s >= %s" --cflags --libs' % (libname, minversion),
- msg=
'Checking for system %s >= %s' % (libname, minversion)
) and
+ msg=
msg
) and
check_functions_headers()):
conf.SET_TARGET_TYPE(libname, 'SYSLIB')
conf.env[found] = True