summaryrefslogtreecommitdiff
path: root/source4/heimdal_build
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2015-08-27 11:44:23 +0200
committerStefan Metzmacher <metze@samba.org>2015-10-31 22:03:14 +0100
commit2f619066fbf2e8310e0a21b6680212c3e676b6ea (patch)
treee759bc93d76f4a0298ac39236d94528241445cd8 /source4/heimdal_build
parent3cb1d6e7c5e0735ee75ec54b987dbccf1da0db7a (diff)
downloadsamba-2f619066fbf2e8310e0a21b6680212c3e676b6ea.tar.gz
s4:heimdal_build: also use check_system_heimdal_lib() for "com_err"
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4/heimdal_build')
-rwxr-xr-xsource4/heimdal_build/wscript_configure5
1 files changed, 2 insertions, 3 deletions
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