[libgdata: 4/5] meson: Fix handling of 'gnome' option

[Philip Withnall <pwithnall src gnome org>]

commit f3156178498beb6e64b001ed255b064c32682d39
Author: Jan Alexander Steffens (heftig) <jan steffens gmail com>
Date:   Tue Jun 25 22:31:40 2019 +0200

    meson: Fix handling of 'gnome' option
    
    HAVE_GNOME needs to be defined. Also move the gcr dep from the 'goa'
    option.

 meson.build | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 26ac64f8..9edfeca2 100644
--- a/meson.build
+++ b/meson.build
@@ -105,7 +105,12 @@ gtk_dep = dependency(
 )
 
 # GNOME support, which pulls in gcr-base-3 to provide non-pageable memory
-enable_gnome = get_option('gnome')
+gcr_dep = dependency('gcr-base-3', required: get_option('gnome'))
+enable_gnome = gcr_dep.found()
+if enable_gnome
+  gdata_private_deps += dependency('gcr-base-3')
+endif
+config_h.set('HAVE_GNOME', gcr_dep.found())
 
 # Check for goa
 # GNOME Online Accounts support -- only used if GNOME support is also enabled
@@ -114,7 +119,6 @@ goa_dep = dependency('goa-1.0', version: '>= 3.8', required: get_option('goa'))
 enable_goa = goa_dep.found()
 if enable_goa
   gdata_deps += goa_dep
-  gdata_private_deps += dependency('gcr-base-3')
 endif
 config_h.set('HAVE_GOA', goa_dep.found())