s4:heimdal_build: also use check_system_heimdal_lib() for "com_err"
authorStefan Metzmacher <metze@samba.org>
Thu, 27 Aug 2015 09:44:23 +0000 (11:44 +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 3d1f67611f6b0d93b9db058dbcd4187cd62fffb4..79b461cc04eb56865301faa411e42e5e8445776f 100755 (executable)
@@ -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