diff options
| author | Andreas Schneider <asn@samba.org> | 2014-01-20 12:37:44 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:05 +0200 |
| commit | ad3a4316705245891d9a66c50817a26a41ac016f (patch) | |
| tree | 918d26a46a4dfdf37d22448b41f3a3491f21eab9 | |
| parent | c6a8edb4a71d2abbe2c7bc151237e37572876653 (diff) | |
| download | samba-ad3a4316705245891d9a66c50817a26a41ac016f.tar.gz samba-ad3a4316705245891d9a66c50817a26a41ac016f.tar.xz samba-ad3a4316705245891d9a66c50817a26a41ac016f.zip | |
wafsamba: Add set_target to CHECK_BUNDLED_SYSTEM.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index 23a0f092608..45946d524bf 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -122,7 +122,7 @@ def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0', def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', checkfunctions=None, headers=None, checkcode=None, onlyif=None, implied_deps=None, - require_headers=True, pkg=None): + require_headers=True, pkg=None, set_target=True): '''check if a library is available as a system library. this first tries via pkg-config, then if that fails tries by testing for a specified function in the specified lib @@ -180,7 +180,8 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', args='"%s >= %s" --cflags --libs' % (pkg, minversion), msg=msg, uselib_store=uselib_store) and check_functions_headers_code()): - conf.SET_TARGET_TYPE(libname, 'SYSLIB') + if set_target: + conf.SET_TARGET_TYPE(libname, 'SYSLIB') conf.env[found] = True if implied_deps: conf.SET_SYSLIB_DEPS(libname, implied_deps) @@ -190,7 +191,8 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0', conf.env[found] = True if implied_deps: conf.SET_SYSLIB_DEPS(libname, implied_deps) - conf.SET_TARGET_TYPE(libname, 'SYSLIB') + if set_target: + conf.SET_TARGET_TYPE(libname, 'SYSLIB') return True conf.env[found] = False if not conf.LIB_MAY_BE_BUNDLED(libname): |