summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-01-24 17:15:49 -0800
committerJelmer Vernooij <jelmer@samba.org>2011-01-24 17:15:49 -0800
commit57d1dcef7ffeab086cf125431f5e03985ba0d0ce (patch)
tree13038e59dac385667c49c6036a7e791d0175c64f
parent4078b649f19adaba3218d8241455138981d0f3a2 (diff)
downloadsamba-57d1dcef7ffeab086cf125431f5e03985ba0d0ce.tar.gz
samba-57d1dcef7ffeab086cf125431f5e03985ba0d0ce.tar.bz2
samba-57d1dcef7ffeab086cf125431f5e03985ba0d0ce.zip
s4-waf: Only show minversion when there was a minimum version specified.
-rw-r--r--buildtools/wafsamba/samba_bundled.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 2e3e1300e3..39edad060d 100644
--- 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