diff options
| author | Andreas Schneider <asn@samba.org> | 2021-12-03 09:13:52 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-12-06 22:08:32 +0000 |
| commit | 61404faf7671f87359cf7c701ac6e159e7f2c7f9 (patch) | |
| tree | f0c2bbb05fa6c96a03643daae641197a1a0570ce /wscript_configure_system_mitkrb5 | |
| parent | 61ce2899791dc9a078b1af4ee62ab29436fe95dc (diff) | |
| download | samba-61404faf7671f87359cf7c701ac6e159e7f2c7f9.tar.gz | |
waf:mitkrb5: Detect com_err with pkgconfig first
It is needed as a dependency later!
Signed-off-by: Andreas Schneider <asn@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, 4 insertions, 5 deletions
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5 index 6f7bbd4ed13..b095f49f635 100644 --- a/wscript_configure_system_mitkrb5 +++ b/wscript_configure_system_mitkrb5 @@ -30,6 +30,10 @@ if isinstance(Options.options.with_system_mitkrb5, list): else: path_krb5_config = None +conf.CHECK_CFG(args="--cflags --libs", package="com_err", uselib_store="com_err") +conf.CHECK_FUNCS_IN('_et_list', 'com_err') +conf.CHECK_HEADERS('com_err.h', lib='com_err') + conf.find_program('krb5-config', path_list=path_krb5_config, var='KRB5_CONFIG') if conf.env.KRB5_CONFIG: conf.CHECK_CFG(path=conf.env.KRB5_CONFIG, args="--cflags --libs", @@ -49,8 +53,6 @@ if conf.env.KRB5_CONFIG: krb5_define_syslib(conf, "gssapi", conf.env['LIB_GSSAPI']) if 'k5crypto' in conf.env['LIB_GSSAPI']: krb5_define_syslib(conf, "k5crypto", conf.env['LIB_GSSAPI']) - if 'com_err' in conf.env['LIB_GSSAPI']: - krb5_define_syslib(conf, "com_err", conf.env['LIB_GSSAPI']) if 'gssapi_krb5' in conf.env['LIB_GSSAPI']: krb5_define_syslib(conf, "gssapi_krb5", conf.env['LIB_GSSAPI']) @@ -79,9 +81,6 @@ if conf.env.KRB5_CONFIG: conf.define('USING_SYSTEM_MITKRB5', '"%s"' % krb5_version) -conf.CHECK_CFG(args="--cflags --libs", package="com_err", uselib_store="com_err") -conf.CHECK_FUNCS_IN('_et_list', 'com_err') -conf.CHECK_HEADERS('com_err.h', lib='com_err') conf.CHECK_HEADERS('kdb.h', lib='kdb5') conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5') |