diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-06-25 22:31:40 +0200 |
|---|---|---|
| committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-06-25 22:31:40 +0200 |
| commit | f3156178498beb6e64b001ed255b064c32682d39 (patch) | |
| tree | b0fd59e257138b11a036eb1e6100feac9a6d0998 /meson.build | |
| parent | be94375e0d164dcc2486e39e7acbace6df12965c (diff) | |
| download | libgdata-f3156178498beb6e64b001ed255b064c32682d39.tar.gz | |
meson: Fix handling of 'gnome' option
HAVE_GNOME needs to be defined. Also move the gcr dep from the 'goa'
option.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 8 |
1 files 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()) |