diff options
| author | Alexander Bokovoy <ab@samba.org> | 2018-02-02 16:34:33 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:25 +0200 |
| commit | ef4b2d4574efafaf7f74f92cd2d7f6e4a5144fd4 (patch) | |
| tree | 4a268e3c65131b4c11e6d57fc3b9a14537b21abb /wscript_configure_system_mitkrb5 | |
| parent | e58ca30bc0352ace41072cf07a85c40cb370a837 (diff) | |
| download | samba-ef4b2d4574efafaf7f74f92cd2d7f6e4a5144fd4.tar.gz | |
wscript_configure_system_mitkrb5: update to handle waf 2.0.4
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'wscript_configure_system_mitkrb5')
| -rw-r--r-- | wscript_configure_system_mitkrb5 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 index 425e3a57166..534818b9dcb 100644 --- a/wscript_configure_system_mitkrb5 +++ b/wscript_configure_system_mitkrb5 @@ -1,4 +1,5 @@ -import Logs, Options, sys +import sys +from waflib import Logs, Options # Check for kerberos have_gssapi=False @@ -53,12 +54,12 @@ if conf.env.KRB5_CONFIG: if 'gssapi_krb5' in conf.env['LIB_GSSAPI']: krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI']) - vendor = conf.cmd_and_log("%(path)s --vendor" % dict(path=conf.env.KRB5_CONFIG) + vendor = conf.cmd_and_log(conf.env.KRB5_CONFIG+['--vendor']) conf.env.KRB5_VENDOR = vendor.strip().lower() if conf.env.KRB5_VENDOR != 'heimdal': conf.define('USING_SYSTEM_KRB5', 1) del conf.env.HEIMDAL_KRB5_CONFIG - krb5_conf_version = conf.cmd_and_log("%(path)s --version" % dict(path=conf.env.KRB5_CONFIG)).strip() + krb5_conf_version = conf.cmd_and_log(conf.env.KRB5_CONFIG+['--version']).strip() krb5_version = krb5_conf_version.split()[-1] @@ -310,4 +311,4 @@ if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'): conf.DEFINE('MIT_KDC_PATH', '"' + Options.options.with_system_mitkdc + '"') else: conf.find_program('krb5kdc', path_list=kdc_path_list, var='MIT_KDC_BINARY', mandatory=True) - conf.DEFINE('MIT_KDC_PATH', '"' + conf.env.MIT_KDC_BINARY + '"') + conf.DEFINE('MIT_KDC_PATH', '"' + " ".join(conf.env.MIT_KDC_BINARY) + '"') |