[geary/geary-0.13] Merge branch 'fix_conditionals' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 3fd89c5a2268f2df3b6ac547a861df530a48faea
Author: Michael Gratton <mike vee net>
Date:   Wed Feb 27 00:07:55 2019 +0000

    Merge branch 'fix_conditionals' into 'master'
    
    Fix valac preprocessor conditionals
    
    Closes #264
    
    See merge request GNOME/geary!145
    
    (cherry picked from commit 2ebfa8cf741f12a0a879c6d6a64e1eb46c894d80)
    
    a0b21119 Fix valac preprocessor conditionals

 meson.build            | 2 --
 src/client/meson.build | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 5f0474ef..4fca8526 100644
--- a/meson.build
+++ b/meson.build
@@ -145,8 +145,6 @@ conf.set_quoted('_WEB_EXTENSIONS_DIR', web_extensions_dir)
 conf.set_quoted('LANGUAGE_SUPPORT_DIRECTORY', locale_dir)
 conf.set_quoted('ISO_CODE_639_XML', iso_639_xml)
 conf.set_quoted('ISO_CODE_3166_XML', iso_3166_xml)
-conf.set('HAVE_LIBMESSAGINGMENU', libmessagingmenu.found())
-conf.set('HAVE_LIBUNITY', libunity.found())
 conf.set('HAVE_FTS3_TOKENIZE', true)
 conf.set('VERSION', meson.project_version())
 conf.set('GCR_API_SUBJECT_TO_CHANGE', true)
diff --git a/src/client/meson.build b/src/client/meson.build
index 424ae473..72c8125b 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -127,6 +127,8 @@ geary_client_dependencies = [
   geary_engine_dep,
 ]
 
+geary_client_vala_options = geary_vala_options
+
 if libmessagingmenu.found()
   messagingmenu_vapi = meson.get_compiler('vala').find_library(
       'MessagingMenu-1.0',
@@ -135,16 +137,18 @@ if libmessagingmenu.found()
   )
   geary_client_dependencies += libmessagingmenu
   geary_client_dependencies += messagingmenu_vapi
+  geary_client_vala_options += ['-D', 'HAVE_LIBMESSAGINGMENU']
 endif
 if libunity.found()
   geary_client_dependencies += libunity
+  geary_client_vala_options += ['-D', 'HAVE_LIBUNITY']
 endif
 
 geary_client_lib = static_library('geary-client',
   geary_client_sources,
   dependencies: geary_client_dependencies,
   include_directories: config_h_dir,
-  vala_args: geary_vala_options,
+  vala_args: geary_client_vala_options,
   c_args: geary_c_options,
 )