diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-08-27 11:40:09 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-10-31 22:03:14 +0100 |
| commit | 3cb1d6e7c5e0735ee75ec54b987dbccf1da0db7a (patch) | |
| tree | f70fe95cc8396d17e74503117c8dc91f5c8c04b0 /source4/heimdal_build | |
| parent | db04752f3ecefc19fbf199930931fa31dde1632c (diff) | |
| download | samba-3cb1d6e7c5e0735ee75ec54b987dbccf1da0db7a.tar.gz | |
s4:heimdal_build: handle CHECK_BUNDLED_SYSTEM returning False in check_system_heimdal_lib()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4/heimdal_build')
| -rwxr-xr-x | source4/heimdal_build/wscript_configure | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 2635b8aeb73..3d1f67611f6 100755 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -197,8 +197,9 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): return False setattr(conf.env, "CPPPATH_%s" % name.upper(), heimdal_includedirs) setattr(conf.env, "LIBPATH_%s" % name.upper(), heimdal_libdirs) - conf.CHECK_BUNDLED_SYSTEM(name, checkfunctions=functions, headers=headers, - onlyif=onlyif) + if not conf.CHECK_BUNDLED_SYSTEM(name, checkfunctions=functions, headers=headers, + onlyif=onlyif): + return False conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True |