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

[Michael Gratton <mjog src gnome org>]

commit f020791935c2ed4a96e7509f9d761e953dd9d739
Author: Michael James Gratton <mike vee net>
Date:   Thu Dec 14 09:34:00 2017 +1100

    Revert "Treat POODLE and REF_TRACKING defines per others in Meson build."
    
    This reverts commit c25f254de843022950ef815d87170f6e98e4aada.

 meson.build     |    3 ---
 src/meson.build |    7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 37da1fd..2185980 100644
--- a/meson.build
+++ b/meson.build
@@ -137,9 +137,6 @@ 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 79f7430..5f307f3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -13,6 +13,13 @@ 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