[atk: 1/2] meson: Fix usage of glib as a subproject dependency

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit 04703e2e9bc6d4f9ebd680c352acfedb829a594a
Author: Nirbheek Chauhan <nirbheek centricular com>
Date:   Sat Dec 1 02:51:25 2018 +0530

    meson: Fix usage of glib as a subproject dependency
    
    We include glib headers, so we need to ensure that we also pull in the
    glib dependency correctly, to inherit the right include flags. Also
    doesn't lead to overlinking because meson uses --as-needed by default.
    
    This wasn't noticed earlier because when building against glib inside
    a prefix, glib and gobject headers are in the same location.

 atk/meson.build | 4 ++--
 meson.build     | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/atk/meson.build b/atk/meson.build
index 191e16e..69ba6c5 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -127,14 +127,14 @@ libatk = shared_library('atk-@0@'.format(atk_api_version),
                         soversion: atk_soversion,
                         version: atk_libversion,
                         install: true,
-                        dependencies: gobject_dep,
+                        dependencies: glib_dep,
                         include_directories: [ root_inc, atk_inc ],
                         c_args: common_cflags + atk_cflags,
                         link_args: common_ldflags)
 
 libatk_dep = declare_dependency(link_with: libatk,
                                 include_directories: [atk_inc, root_inc],
-                                dependencies: gobject_dep,
+                                dependencies: glib_dep,
                                 sources: atk_enum_h)
 
 if not meson.is_cross_build() and get_option('introspection')
diff --git a/meson.build b/meson.build
index 7c66a8c..e5a6e3a 100644
--- a/meson.build
+++ b/meson.build
@@ -92,9 +92,12 @@ foreach f: checked_funcs
 endforeach
 
 # Dependencies
-gobject_req_version = '>= 2.31.2'
+glib_req_version = '>= 2.31.2'
 
-gobject_dep = dependency('gobject-2.0', version: gobject_req_version, fallback : ['glib', 'libgobject_dep'])
+glib_dep = [dependency('glib-2.0', version: glib_req_version,
+                          fallback : ['glib', 'libglib_dep']),
+            dependency('gobject-2.0', version: glib_req_version,
+                          fallback : ['glib', 'libgobject_dep'])]
 
 # Compat variables for pkgconfig
 pkgconf = configuration_data()