2021-02-21 00:02:15 +00:00
|
|
|
--- a/wscript_configure_embedded_heimdal
|
|
|
|
+++ b/wscript_configure_embedded_heimdal
|
2022-10-06 20:44:23 +00:00
|
|
|
@@ -6,3 +6,14 @@ if not conf.env['BISON']:
|
2021-06-27 13:15:26 +00:00
|
|
|
|
2022-10-06 20:44:23 +00:00
|
|
|
conf.define('USING_EMBEDDED_HEIMDAL', 1)
|
|
|
|
conf.RECURSE('third_party/heimdal_build')
|
2019-12-13 16:22:33 +00:00
|
|
|
+
|
|
|
|
+def check_system_heimdal_binary(name):
|
|
|
|
+ if conf.LIB_MAY_BE_BUNDLED(name):
|
|
|
|
+ return False
|
|
|
|
+ if not conf.find_program(name, var=name.upper()):
|
|
|
|
+ return False
|
|
|
|
+ conf.define('USING_SYSTEM_%s' % name.upper(), 1)
|
|
|
|
+ return True
|
|
|
|
+
|
|
|
|
+check_system_heimdal_binary("compile_et")
|
|
|
|
+check_system_heimdal_binary("asn1_compile")
|
2021-02-21 00:02:15 +00:00
|
|
|
--- a/wscript_configure_system_heimdal
|
|
|
|
+++ b/wscript_configure_system_heimdal
|
2019-12-13 16:22:33 +00:00
|
|
|
@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, funct
|
|
|
|
conf.define('USING_SYSTEM_%s' % name.upper(), 1)
|
|
|
|
return True
|
|
|
|
|
|
|
|
-def check_system_heimdal_binary(name):
|
|
|
|
- if conf.LIB_MAY_BE_BUNDLED(name):
|
|
|
|
- return False
|
|
|
|
- if not conf.find_program(name, var=name.upper()):
|
|
|
|
- return False
|
|
|
|
- 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"):
|
2022-10-06 20:44:23 +00:00
|
|
|
@@ -86,9 +78,6 @@ finally:
|
2019-12-13 16:22:33 +00:00
|
|
|
#if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
|
|
|
|
# conf.define('USING_SYSTEM_TOMMATH', 1)
|
|
|
|
|
|
|
|
-check_system_heimdal_binary("compile_et")
|
|
|
|
-check_system_heimdal_binary("asn1_compile")
|
|
|
|
-
|
2022-10-06 20:44:23 +00:00
|
|
|
conf.env.KRB5_VENDOR = 'heimdal'
|
2019-12-13 16:22:33 +00:00
|
|
|
conf.define('USING_SYSTEM_KRB5', 1)
|
2022-10-06 20:44:23 +00:00
|
|
|
conf.define('USING_SYSTEM_HEIMDAL', 1)
|