- --- a/wscript_configure_embedded_heimdal
- +++ b/wscript_configure_embedded_heimdal
- @@ -2,3 +2,14 @@ if not conf.env['FLEX']:
- conf.fatal("Embedded Heimdal build requires flex but it was not found. Install flex or use --with-system-mitkrb5 or --with-system-heimdalkrb5")
-
- conf.RECURSE('source4/heimdal_build')
- +
- +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")
- --- a/wscript_configure_system_heimdal
- +++ b/wscript_configure_system_heimdal
- @@ -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"):
- @@ -96,7 +88,4 @@ finally:
- #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")
- -
- conf.define('USING_SYSTEM_KRB5', 1)
|
