[geary] Treat POODLE and REF_TRACKING defines per others in Meson build.

[Michael Gratton <mjog src gnome org>]

commit c25f254de843022950ef815d87170f6e98e4aada
Author: Michael James Gratton <mike vee net>
Date:   Tue Dec 12 15:49:30 2017 +1100

    Treat POODLE and REF_TRACKING defines per others in Meson build.

 meson.build     |    3 +++
 src/meson.build |    7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2185980..37da1fd 100644
--- a/meson.build
+++ b/meson.build
@@ -137,6 +137,9 @@ 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)
+conf.set('DISABLE_POODLE', not poodle)
+conf.set('REF_TRACKING', reference_tracking)
+
 configure_file(output: 'config.h', configuration: conf)
 
 # Post-install scripts
diff --git a/src/meson.build b/src/meson.build
index bed6282..4763e9b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,13 +13,6 @@ geary_vala_options = [
   '--enable-deprecated',
 ]
 
-if reference_tracking
-  geary_vala_options += [ '--define=REF_TRACKING' ]
-endif
-if not poodle
-  geary_vala_options += [ '--define=DISABLE_POODLE' ]
-endif
-
 geary_c_options = [
   '-include', 'config.h',
   # Vala causes a _lot_ of these to be emitted for otherwise valid