[gnome-initial-setup/wip/port-to-gtk4: 17/17] build: Check for libadwaita before malcontent-ui

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit f763ed2c8255890e5705c5e11dedbb9d475a563e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Mon Jul 25 15:31:27 2022 -0300

    build: Check for libadwaita before malcontent-ui
    
    Otherwise it may find an older version in the host system, cache it,
    and fail to fallback to the submodule.

 gnome-initial-setup/meson.build |  7 -------
 meson.build                     | 10 ++++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 3c057e32..fac8d1b8 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -27,13 +27,6 @@ sources += [
     'gis-keyring.h'
 ]
 
-libadwaita_dep = dependency(
-  'libadwaita-1',
-  version: '>= 1.2.alpha',
-  fallback: ['libadwaita', 'libadwaita_dep'],
-  default_options: ['examples=false', 'introspection=disabled', 'tests=false', 'vapi=false'],
-)
-
 geocode_glib_2_dep = dependency(
   'geocode-glib-2.0',
   fallback: ['geocode-glib', 'geocode_glib_dep'],
diff --git a/meson.build b/meson.build
index 80659b04..8af42f7f 100644
--- a/meson.build
+++ b/meson.build
@@ -53,6 +53,16 @@ ibus_dep = dependency ('ibus-1.0',
 have_ibus = ibus_dep.found()
 conf.set('HAVE_IBUS', have_ibus)
 
+# Check for libadwaita before malcontent-ui, otherwise Meson may search and
+# find an older version of libadwaita in the host system, cache it, and fail
+# to fallback to a submodule.
+libadwaita_dep = dependency(
+  'libadwaita-1',
+  version: '>= 1.2.alpha',
+  fallback: ['libadwaita', 'libadwaita_dep'],
+  default_options: ['examples=false', 'introspection=disabled', 'tests=false', 'vapi=false'],
+)
+
 # Needed for the parental controls pages
 libmalcontent_dep = dependency ('malcontent-0',
                                 version: '>= 0.6.0',