[gnome-clocks/wip/exalm/libhandy: 6/6] meson: Fix libhandy subproject

[Alexander Mikhaylenko <alexm src gnome org>]

commit a0e64e60736769a09f5e7c98bdd504f37b1799a1
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Jun 8 04:03:53 2020 +0500

    meson: Fix libhandy subproject
    
    Fallback doesn't work with vapi, see https://github.com/mesonbuild/meson/issues/1923

 meson.build | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7374fa2..28bd4d6 100644
--- a/meson.build
+++ b/meson.build
@@ -19,8 +19,26 @@ gweather = dependency('gweather-3.0', version: '>=3.32.0')
 gnomedesktop = dependency('gnome-desktop-3.0', version: '>=3.8')
 geocodeglib = dependency('geocode-glib-1.0', version: '>=1.0')
 libgeoclue = dependency('libgeoclue-2.0', version: '>=2.4')
-libhandy = dependency ('libhandy-1', version: '>= 0.80.0',
-                       fallback: ['libhandy', 'libhandy_dep'])
+libhandy = dependency ('libhandy-1', version: '>= 0.80.0', required: false)
+
+if not libhandy.found()
+  libhandy_subproj = subproject(
+    'libhandy',
+    default_options: [
+      'examples=false',
+      'glade_catalog=disabled',
+      'tests=false',
+    ]
+  )
+
+  # When using libhandy as subproject, make sure we get the VAPI file
+  libhandy = declare_dependency(
+    dependencies: [
+      libhandy_subproj.get_variable('libhandy_dep'),
+      libhandy_subproj.get_variable('libhandy_vapi'),
+    ]
+  )
+endif
 
 cc = meson.get_compiler('c')
 math = cc.find_library('m', required: false)