From 2f619066fbf2e8310e0a21b6680212c3e676b6ea Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 27 Aug 2015 11:44:23 +0200 Subject: s4:heimdal_build: also use check_system_heimdal_lib() for "com_err" Signed-off-by: Stefan Metzmacher Reviewed-by: Jelmer Vernooij --- source4/heimdal_build/wscript_configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 3d1f67611f6..79b461cc04e 100755 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -187,9 +187,6 @@ if krb5_config: finally: f.close() -if conf.CHECK_BUNDLED_SYSTEM('com_err', checkfunctions='com_right_r com_err', headers='com_err.h'): - conf.define('USING_SYSTEM_COM_ERR', 1) - def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): # Only use system library if the user requested the bundled one not be # used. @@ -211,6 +208,8 @@ def check_system_heimdal_binary(name): conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True +check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") + if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): conf.env.CPPPATH_ROKEN_HOSTCC = conf.env.CPPPATH_ROKEN conf.env.LIBPATH_ROKEN_HOSTCC = conf.env.LIBPATH_ROKEN -- cgit v1.2.1