heimdal_build: Use existing functions for finding system libraries.

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 29b0a501c87b8b47cb276fe3a5bdc794edddd6ff..822e49ce49aa4a31db7da5a1e5d539aad5c87b5f 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -104,7 +104,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
         '''helper function for CHECK_BUNDLED_SYSTEM'''
         if checkfunctions is None:
             return True
-        if require_headers and headers and not conf.CHECK_HEADERS(headers):
+        if require_headers and headers and not conf.CHECK_HEADERS(headers, lib=libname):
             return False
         return conf.CHECK_FUNCS_IN(checkfunctions, libname, headers=headers,
                                    empty_decl=False, set_target=False)

diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index e0c435dc5ec5d94483dca80415a7de832c636c77..727344c3b46f6dfc1277f6bb80c614eb89709cb0 100644 (file)
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -72,12 +72,7 @@ def check_bundled_heimdal_lib(name, functions, headers):
     lib = name
     setattr(conf.env, "CPPPATH_%s" % name.upper(), ["/usr/include/heimdal"])
     setattr(conf.env, "LIBPATH_%s" % name.upper(), ["/usr/lib/heimdal"])
-    if not conf.CHECK_HEADERS(headers, lib=lib):
-        Logs.error('ERROR: Unable to find missing header %s' % headers)
-        sys.exit(1)
-    if not conf.CHECK_LIB([lib], mandatory=True, set_target=True):
-        Logs.error('ERROR: Unable to find missing library %s' % lib)
-        sys.exit(1)
+    conf.CHECK_BUNDLED_SYSTEM("wind", checkfunctions=functions, headers=headers)
     conf.define('USING_SYSTEM_%s' % name.upper(), 1)