[balsa/wip/gtk4: 131/351] Meson build system changes



commit d45eacc6fa7f85e08728817542f515360abb56e1
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jan 20 11:28:11 2018 -0500

    Meson build system changes
    
    Meson build system changes to mirror the autotools changes in the previous commit
    
        * libnetclient/meson.build: add c_args: '-DG_LOG_DOMAIN="libnetclient"'
        to static_library arguments.
        * meson.build: drop sed and ncat prerequisites.

 libnetclient/meson.build |    1 +
 meson.build              |    9 ++-------
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/libnetclient/meson.build b/libnetclient/meson.build
index a7e8ba6..5913481 100644
--- a/libnetclient/meson.build
+++ b/libnetclient/meson.build
@@ -12,6 +12,7 @@ libnetclient_a_sources = [
   ]
 
 libnetclient_a = static_library('netclient', libnetclient_a_sources,
+                                c_args              : '-DG_LOG_DOMAIN="libnetclient"',
                                 dependencies        : libnetclient_deps,
                                 include_directories : top_include,
                                 install             : false)
diff --git a/meson.build b/meson.build
index 38d8ddf..7907f8e 100644
--- a/meson.build
+++ b/meson.build
@@ -393,7 +393,8 @@ if gss
   endif
   krb5_dep = declare_dependency(compile_args : krb5_cflags,
                                 link_args    : krb5_libs)
-  balsa_deps += krb5_dep
+  balsa_deps        += krb5_dep
+  libnetclient_deps += krb5_dep
 endif # gss
 
 # Libnotify configuration
@@ -608,8 +609,6 @@ endif # libnetclient_docs
 
 if libnetclient_test
   have_sput           = compiler.has_header('sput.h')
-  sed_program         = find_program('sed',         required : false)
-  ncat_program        = find_program('ncat',        required : false)
   valgrind_program    = find_program('valgrind',    required : false)
   lcov_program        = find_program('lcov',        required : false)
   genhtml_program     = find_program('genhtml',     required : false)
@@ -619,8 +618,6 @@ if libnetclient_test
   inetsim_program     = find_program('inetsim',     required : false)
 
   if not (have_sput
-          and sed_program.found()
-          and ncat_program.found()
           and valgrind_program.found()
           and lcov_program.found()
           and genhtml_program.found()
@@ -631,8 +628,6 @@ if libnetclient_test
     error('*** Cannot run libnetclient tests, see libnetclient/README for fixing this issue ***')
   endif
 
-  sed         = sed_program.path()
-  ncat        = ncat_program.path()
   valgrind    = valgrind_program.path()
   lcov        = lcov_program.path()
   genhtml     = genhtml_program.path()


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