[libsoup] meson: Avoid getting krb5_config option value early



commit d6116d09f9dbfb256023e1ded9e2c2a322c0d520
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Apr 13 16:03:23 2018 +0200

    meson: Avoid getting krb5_config option value early
    
    If GSSAPI is enabled and libsoup is not built using Microsoft
    compiler Kerberos can be used. Then the `krb5-config` binary is
    used. Until then is not necessary to check the `krb5_config`
    option.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=795233

 meson.build |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5b71022..615c3f4 100644
--- a/meson.build
+++ b/meson.build
@@ -155,7 +155,6 @@ cdata.set('HAVE_CURL', find_program('curl', required : false).found())
 # GSSAPI support #
 ##################
 enable_gssapi = get_option('gssapi')
-krb5_config_option = get_option('krb5_config')
 if enable_gssapi
   if cc.get_id() == 'msvc'
     if host_machine.cpu_family() == 'x86'
@@ -169,6 +168,8 @@ if enable_gssapi
       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 = find_program(krb5_config_path, required : false)
 


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