[gnome-initial-setup/meson-port] fixup! build: Add cheese, ibus, and packagekit optional dependencies

[Will Thompson <wjt src gnome org>]

commit a155ff6dd7a43307dd8e7ee0eca478cf415793ba
Author: Will Thompson <will willthompson co uk>
Date:   Mon Jul 23 10:30:27 2018 +0100

    fixup! build: Add cheese, ibus, and packagekit optional dependencies

 gnome-initial-setup/meson.build | 4 ++++
 meson.build                     | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 7bf2995..c461562 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -45,6 +45,10 @@ dependencies = [
     dependency ('libsecret-1'),
     dependency ('pwquality'),
     dependency ('webkit2gtk-4.0'),
+    cheese_dep,
+    cheese_gtk_dep,
+    pkgkit_dep,
+    ibus_dep,
 ]
 
 executable(
diff --git a/meson.build b/meson.build
index cd38255..9c832bb 100644
--- a/meson.build
+++ b/meson.build
@@ -31,10 +31,13 @@ conf.set_quoted('PKGDATADIR', pkgdata_dir)
 conf.set('ENABLE_REGION_PAGE', get_option('enable-region-page'))
 
 # Needed for the 'account' page
-cheese_dep = dependency ('cheese-gtk',
+cheese_dep = dependency ('cheese',
                          version: '>= 3.3.5',
                          required: get_option('enable-cheese'))
-conf.set('HAVE_CHEESE', cheese_dep.found())
+cheese_gtk_dep = dependency ('cheese-gtk',
+                         version: '>= 3.3.5',
+                         required: get_option('enable-cheese'))
+conf.set('HAVE_CHEESE', cheese_dep.found() and cheese_gtk_dep.found())
 
 # Needed for the 'software' page
 pkgkit_dep = dependency ('packagekit-glib2',