[libsoup] Meson: Do not fallback to system krb5-config when cross building



commit 0bc243498abd827fa2ef2421eb5fbeda23608eca
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Wed Jul 24 14:19:17 2019 -0400

    Meson: Do not fallback to system krb5-config when cross building

 meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index aa9a23fc..c4f4c7fb 100644
--- a/meson.build
+++ b/meson.build
@@ -286,8 +286,10 @@ if cc.get_id() == 'msvc'
       add_project_link_arguments('gssapi@0@.lib'.format(gssapi_lib_type), language : 'c')
   endif
 else
-  krb5_config_option = get_option('krb5_config')
-  krb5_config_path = krb5_config_option != '' ? krb5_config_option : 'krb5-config'
+  krb5_config_path = get_option('krb5_config')
+  if not meson.is_cross_build() and krb5_config_path == ''
+    krb5_config_path = 'krb5-config'
+  endif
   krb5_config = find_program(krb5_config_path, required : gssapi_opt)
   if krb5_config.found()
     libs_output = run_command (krb5_config, '--libs', 'gssapi', check: gssapi_opt.enabled())


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]