From 57d1dcef7ffeab086cf125431f5e03985ba0d0ce Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 24 Jan 2011 17:15:49 -0800 Subject: s4-waf: Only show minversion when there was a minimum version specified. --- buildtools/wafsamba/samba_bundled.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'buildtools') 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 -- cgit