s4:heimdal_build: handle CHECK_BUNDLED_SYSTEM returning False in check_system_heimdal...
authorStefan Metzmacher <metze@samba.org>
Thu, 27 Aug 2015 09:40:09 +0000 (11:40 +0200)
committerStefan Metzmacher <metze@samba.org>
Sat, 31 Oct 2015 21:03:14 +0000 (22:03 +0100)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
source4/heimdal_build/wscript_configure

index 2635b8aeb73810eb43bd986cf130c83c758544e7..3d1f67611f6b0d93b9db058dbcd4187cd62fffb4 100755 (executable)
@@ -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