[balsa/wip/gmime3: 104/197] .split() strings returned by custom config command



commit 5338699a2f4db8b9732bf1fafe44dfc6e839c72a
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Sep 27 21:37:27 2017 -0400

    .split() strings returned by custom config command
    
        * meson.build: .split() strings returned by custom config commands.

 ChangeLog   |    4 ++++
 meson.build |   16 +++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 66183db..38f2903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-09-27  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       * meson.build: .split() strings returned by custom config commands.
+
 2017-09-26  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Use gnome.genmarshal if glib is new enough
diff --git a/meson.build b/meson.build
index 27e813b..fda7022 100644
--- a/meson.build
+++ b/meson.build
@@ -253,16 +253,10 @@ if gpgmecfg != 'false'
     endif
 
     gpgme_cflags = run_command(gpgmecfg, '--cflags')
-    gpgme_cflags = gpgme_cflags.stdout().strip()
-    gpgme_libs   = gpgme_libs.stdout().strip()
-    gpgme_libs   = gpgme_libs.split(' ')
+    gpgme_cflags = gpgme_cflags.stdout().strip().split()
+    gpgme_libs   = gpgme_libs.stdout().strip().split()
 
-    if gpgme_cflags != ''
-      gpgme_dep = declare_dependency(compile_args : gpgme_cflags,
-                                     link_args    : gpgme_libs)
-    else
-      gpgme_dep = declare_dependency(link_args    : gpgme_libs)
-    endif
+    gpgme_dep = declare_dependency(compile_args : gpgme_cflags, link_args : gpgme_libs)
     conf.set('HAVE_GPGME', 1,
              description : 'Defined when gpgme is available.')
     balsa_deps += gpgme_dep
@@ -391,8 +385,8 @@ if gss
   conf.set('HAVE_GSSAPI', 1,
     description : 'Defined when GSSAPI support is to be compiled.')
   krb5_config = krb5_config_program.path()
-  krb5_cflags = run_command(krb5_config, '--cflags gssapi').stdout().strip()
-  krb5_libs = run_command(krb5_config, '--libs gssapi').stdout().strip()
+  krb5_cflags = run_command(krb5_config, ['--cflags', 'gssapi']).stdout().strip().split()
+  krb5_libs   = run_command(krb5_config, ['--libs',   'gssapi']).stdout().strip().split()
   if compiler.has_header('gssapi.h')
     conf.set('HAVE_HEIMDAL', 1,
       description : 'Defined for Heimdal.')


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