gnome-control-center-3.30.1-optional.patch

diff '--exclude=.git' -urN a/meson.build b/meson.build
--- a/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/meson.build	2018-10-01 21:28:10.185896945 -0500
@@ -101,13 +101,11 @@
 
 accounts_dep = dependency('accountsservice', version: '>= 0.6.39')
 clutter_gtk_dep = dependency('clutter-gtk-1.0', required: false)
-colord_dep = dependency('colord', version: '>= 0.1.34')
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
 gio_dep = dependency('gio-2.0')
 glib_dep = dependency('glib-2.0', version: '>= 2.53.0')
 gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90')
 gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90')
-goa_dep = dependency('goa-1.0', version: goa_req_version)
 gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.27.2')
 libxml_dep = dependency('libxml-2.0')
 polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103')
@@ -128,25 +126,30 @@
   dependency('gtk+-3.0', version: '>= 3.22.20')
 ]
 
-# Check for CUPS 1.4 or newer
-cups_dep = dependency('cups', version : '>= 1.4', required: false)
-assert(cups_dep.found(), 'CUPS 1.4 or newer not found')
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=696766
-cups_cflags = []
-if cups_dep.version().version_compare('>= 1.6')
-  cups_cflags += '-D_PPD_DEPRECATED=""'
-endif
-
-# cups headers
-check_headers = [
-  ['HAVE_CUPS_CUPS_H', 'cups/cups.h'],
-  ['HAVE_CUPS_PPD_H', 'cups/ppd.h']
-]
+# Optional dependency for the printers panel
+enable_cups = get_option('cups')
+if enable_cups
+  cups_dep = dependency('cups', version : '>= 1.4', required: false)
+  assert(cups_dep.found(), 'CUPS 1.4 or newer not found')
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=696766
+  cups_cflags = []
+  if cups_dep.version().version_compare('>= 1.6')
+    cups_cflags += '-D_PPD_DEPRECATED=""'
+  endif
+
+  # cups headers
+  check_headers = [
+    ['HAVE_CUPS_CUPS_H', 'cups/cups.h'],
+    ['HAVE_CUPS_PPD_H', 'cups/ppd.h']
+  ]
 
-foreach header: check_headers
-  assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1])
-endforeach
+  foreach header: check_headers
+    assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1])
+  endforeach
+endif
+config_h.set('BUILD_PRINTERS', enable_cups,
+             description: 'Defined if cups support is enabled')
 
 # Optional dependency for the user accounts panel
 enable_cheese = get_option('cheese')
@@ -162,6 +165,22 @@
 config_h.set('HAVE_CHEESE', enable_cheese,
              description: 'Define to 1 to enable cheese webcam support')
 
+# Optional dependency for the color panel
+enable_color = get_option('color')
+if enable_color
+  colord_dep = dependency('colord', version: '>= 0.1.34')
+endif
+config_h.set('BUILD_COLOR', enable_color,
+             description: 'Defined if color support is enabled')
+
+# Optional dependency for the online accounts panel
+enable_goa = get_option('goa')
+if enable_goa
+  goa_dep = dependency('goa-1.0', version: goa_req_version)
+endif
+config_h.set('BUILD_ONLINE_ACCOUNTS', enable_goa,
+             description: 'Defined if goa support is enabled')
+
 # IBus support
 enable_ibus = get_option('ibus')
 if enable_ibus
@@ -182,48 +201,57 @@
              description: 'Define to 1 if Wayland is enabled')
 
 if host_is_linux
-  # network manager
-  network_manager_deps = [
-    dependency('libnm', version: '>= 1.10.0'),
-    dependency('libnma', version: '>= 1.8.0'),
-    dependency('mm-glib', version: '>= 0.7')
-  ]
+  # Optional dependency for the network panel
+  enable_networkmanager = get_option('networkmanager')
+  if enable_networkmanager
+    network_manager_deps = [
+      dependency('libnm', version: '>= 1.10.0'),
+      dependency('libnma', version: '>= 1.8.0'),
+      dependency('mm-glib', version: '>= 0.7')
+    ]
+  endif
+  config_h.set('BUILD_NETWORK', enable_networkmanager,
+               description: 'Define to 1 to build the Network panel')
+  config_h.set('HAVE_NETWORK_MANAGER', enable_networkmanager,
+               description: 'Define to 1 if NetworkManager is available')
 endif
-config_h.set('BUILD_NETWORK', host_is_linux,
-             description: 'Define to 1 to build the Network panel')
-config_h.set('HAVE_NETWORK_MANAGER', host_is_linux,
-             description: 'Define to 1 if NetworkManager is available')
 
 if host_is_linux_not_s390
-  # gnome-bluetooth
-  gnome_bluetooth_dep = dependency('gnome-bluetooth-1.0', version: '>= 3.18.2')
-
-  # Wacom
-  assert(clutter_gtk_dep.found(), 'clutter-gtk library is required for wacom support, but is not available.')
-
-  libwacom_dep = dependency('libwacom', version: '>= 0.7')
-
-  wacom_deps = [
-    clutter_gtk_dep,
-    libwacom_dep,
-    dependency('clutter-1.0', version: '>= 1.11.3'),
-  ]
-  config_h.set('HAVE_WACOM_3D_STYLUS', libwacom_dep.version().version_compare('>= 0.27'),
-               description: 'Define to 1 if libwacom provides definition for 3D styli')
-else
-  message('Bluetooth and Wacom panels will not be built (no USB support on this platform)')
-  message('Thunderbolt panel will not be built (not supported on this platform)')
-endif
-config_h.set('BUILD_BLUETOOTH', host_is_linux_not_s390,
-             description: 'Define to 1 to build the Bluetooth panel')
-config_h.set('HAVE_BLUETOOTH', host_is_linux_not_s390,
-             description: 'Define to 1 if bluetooth support is available')
-config_h.set('BUILD_WACOM', host_is_linux_not_s390,
-             description: 'Define to 1 to build the Wacom panel')
-config_h.set('HAVE_WACOM', host_is_linux_not_s390,
-             description: 'Define to 1 if Wacom is supportted')
-config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390,
-             description: 'Define to 1 to build the Thunderbolt panel')
+  # Optional dependency for the bluetooth panel
+  enable_bluetooth = get_option('bluetooth')
+  if enable_bluetooth
+    gnome_bluetooth_dep = dependency('gnome-bluetooth-1.0', version: '>= 3.18.2')
+  endif
+  config_h.set('BUILD_BLUETOOTH', enable_bluetooth,
+               description: 'Define to 1 to build the Bluetooth panel')
+  config_h.set('HAVE_BLUETOOTH', enable_bluetooth,
+               description: 'Define to 1 if bluetooth support is available')
+
+  # Optional dependency for the wacom panel
+  enable_wacom = get_option('wacom')
+  if enable_wacom
+    assert(clutter_gtk_dep.found(), 'clutter-gtk library is required for wacom support, but is not available.')
+
+    libwacom_dep = dependency('libwacom', version: '>= 0.7')
+
+    wacom_deps = [
+      clutter_gtk_dep,
+      libwacom_dep,
+      dependency('clutter-1.0', version: '>= 1.11.3'),
+    ]
+    config_h.set('HAVE_WACOM_3D_STYLUS', libwacom_dep.version().version_compare('>= 0.27'),
+                 description: 'Define to 1 if libwacom provides definition for 3D styli')
+  endif
+  config_h.set('BUILD_WACOM', enable_wacom,
+               description: 'Define to 1 to build the Wacom panel')
+  config_h.set('HAVE_WACOM', enable_wacom,
+               description: 'Define to 1 if Wacom is supportted')
+
+  # Optional dependency for the thunderbolt panel
+  enable_thunderbolt = get_option('thunderbolt')
+  config_h.set('BUILD_THUNDERBOLT', enable_thunderbolt,
+               description: 'Define to 1 to build the Thunderbolt panel')
+endif
 
 # Check for info panel
 gnome_session_libexecdir = get_option('gnome_session_libexecdir')
@@ -270,16 +298,21 @@
 output += '\n        ' + meson.project_name() + ' - ' + meson.project_version() + '\n'
 output += '    ===================================\n'
 output += ' Options \n'
-output += '     Documentation .............................. ' + get_option('documentation').to_string() + '\n'
-output += '     Tracing .................................... ' + enable_tracing.to_string() + '\n'
-output += '     gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n'
-output += '     Optimized .................................. ' + control_center_optimized.to_string() + '\n'
+output += '     Documentation ....................................... ' + get_option('documentation').to_string() + '\n'
+output += '     Tracing ............................................. ' + enable_tracing.to_string() + '\n'
+output += '     gnome-session libexecdir ............................ ' + gnome_session_libexecdir + '\n'
+output += '     Optimized ........................................... ' + control_center_optimized.to_string() + '\n'
 output += ' Panels \n'
-output += '     GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n'
-output += '     Cheese (Users panel webcam support) ........ ' + enable_cheese.to_string() + '\n'
-output += '     IBus (Region panel IBus support) ........... ' + enable_ibus.to_string() + '\n'
-output += '     NetworkManager (Network panel) ............. ' + host_is_linux.to_string() + '\n'
-output += '     Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n'
-output += '     Wayland .................................... ' + enable_wayland.to_string() + '\n'
+output += '     GNOME Bluetooth (Bluetooth panel) ................... ' + enable_bluetooth.to_string() + '\n'
+output += '     Cheese (Users panel webcam support) ................. ' + enable_cheese.to_string() + '\n'
+output += '     Color (Color panel) ................................. ' + enable_color.to_string() + '\n'
+output += '     CUPS (Printers panel) ............................... ' + enable_cups.to_string() + '\n'
+output += '     GNOME Online Accounts (Online Accounts panel)........ ' + enable_goa.to_string() + '\n'
+output += '     IBus (Region panel IBus support) .................... ' + enable_ibus.to_string() + '\n'
+output += '     Kerberos ............................................ ' + enable_krb.to_string() + '\n'
+output += '     NetworkManager (Network panel) ...................... ' + enable_networkmanager.to_string() + '\n'
+output += '     Thunderbolt (Thunderbolt panel) ..................... ' + enable_thunderbolt.to_string() + '\n'
+output += '     Wacom (Wacom tablet panel) .......................... ' + enable_wacom.to_string() + '\n'
+output += '     Wayland ............................................. ' + enable_wayland.to_string() + '\n'
 
-message(output)
\ No newline at end of file
+message(output)
diff '--exclude=.git' -urN a/meson_options.txt b/meson_options.txt
--- a/meson_options.txt	2018-09-25 19:27:31.000000000 -0500
+++ b/meson_options.txt	2018-10-01 20:45:02.536619522 -0500
@@ -1,6 +1,14 @@
+option('bluetooth', type: 'boolean', value: true, description: 'build with GNOME Bluetooth support')
 option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support')
+option('color', type: 'boolean', value: true, description: 'build with colord support')
+option('cups', type: 'boolean', value: true, description: 'build with CUPS support')
 option('documentation', type: 'boolean', value: false, description: 'build documentation')
 option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir')
+option('goa', type: 'boolean', value: true, description: 'build with GNOME Online Accounts support')
 option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
+option('krb', type: 'boolean', value: true, description: 'build with kerberos support')
+option('networkmanager', type: 'boolean', value: true, description: 'build with NetworkManager support')
+option('thunderbolt', type: 'boolean', value: true, description: 'build with Thunderbolt support')
 option('tracing', type: 'boolean', value: false, description: 'add extra debugging information')
+option('wacom', type: 'boolean', value: true, description: 'build with Wacom support')
 option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
\ No newline at end of file
diff '--exclude=.git' -urN a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
--- a/panels/background/bg-pictures-source.c	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/background/bg-pictures-source.c	2018-10-01 19:28:35.218571344 -0500
@@ -23,13 +23,17 @@
 
 #include "bg-pictures-source.h"
 
+#ifdef BUILD_ONLINE_ACCOUNTS
 #include "cc-background-grilo-miner.h"
+#endif
 #include "cc-background-item.h"
 
 #include <string.h>
 #include <cairo-gobject.h>
 #include <gio/gio.h>
+#ifdef BUILD_ONLINE_ACCOUNTS
 #include <grilo.h>
+#endif
 #include <libgnome-desktop/gnome-desktop-thumbnail.h>
 #include <gdesktop-enums.h>
 
@@ -43,7 +47,9 @@
 
   GCancellable *cancellable;
 
+#ifdef BUILD_ONLINE_ACCOUNTS
   CcBackgroundGriloMiner *grl_miner;
+#endif
 
   GnomeDesktopThumbnailFactory *thumb_factory;
 
@@ -85,7 +91,9 @@
       g_clear_object (&source->cancellable);
     }
 
+#ifdef BUILD_ONLINE_ACCOUNTS
   g_clear_object (&source->grl_miner);
+#endif
   g_clear_object (&source->thumb_factory);
 
   G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
@@ -460,7 +468,11 @@
   gboolean retval = FALSE;
   g_autoptr(GFile) pictures_dir = NULL;
   g_autoptr(GFile) cache_dir = NULL;
+#ifdef BUILD_ONLINE_ACCOUNTS
   GrlMedia *media;
+#else
+  gpointer media = NULL;
+#endif
 
   /* find png and jpeg files */
   if (!content_type)
@@ -516,7 +528,9 @@
 
  read_file:
 
+#ifdef BUILD_ONLINE_ACCOUNTS
   media = g_object_get_data (G_OBJECT (file), "grl-media");
+#endif
   if (media == NULL)
     {
       g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
@@ -590,6 +604,7 @@
   return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
 }
 
+#ifdef BUILD_ONLINE_ACCOUNTS
 static gboolean
 add_single_file_from_media (BgPicturesSource *bg_source,
                             GFile            *file,
@@ -614,6 +629,7 @@
 
   return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
 }
+#endif /* BUILD_ONLINE_ACCOUNTS */
 
 gboolean
 bg_pictures_source_add (BgPicturesSource     *bg_source,
@@ -930,6 +946,7 @@
   return monitor;
 }
 
+#ifdef BUILD_ONLINE_ACCOUNTS
 static void
 media_found_cb (BgPicturesSource *self, GrlMedia *media)
 {
@@ -941,6 +958,7 @@
   g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
   add_single_file_from_media (self, file, media);
 }
+#endif /* BUILD_ONLINE_ACCOUNTS */
 
 static void
 bg_pictures_source_init (BgPicturesSource *self)
@@ -964,9 +982,11 @@
   cache_path = bg_pictures_source_get_cache_path ();
   self->cache_dir_monitor = monitor_path (self, cache_path);
 
+#ifdef BUILD_ONLINE_ACCOUNTS
   self->grl_miner = cc_background_grilo_miner_new ();
   g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
   cc_background_grilo_miner_start (self->grl_miner);
+#endif /* BUILD_ONLINE_ACCOUNTS */
 
   self->thumb_factory =
     gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
diff '--exclude=.git' -urN a/panels/background/meson.build b/panels/background/meson.build
--- a/panels/background/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/background/meson.build	2018-10-01 20:53:41.449889789 -0500
@@ -75,7 +75,6 @@
   'bg-source.c',
   'bg-wallpapers-source.c',
   'cc-background-chooser-dialog.c',
-  'cc-background-grilo-miner.c',
   'cc-background-item.c',
   'cc-background-xml.c'
 )
@@ -83,12 +82,21 @@
 deps = common_deps + [
   gdk_pixbuf_dep,
   gnome_desktop_dep,
-  goa_dep,
   libxml_dep,
-  dependency('cairo-gobject'),
-  dependency('grilo-0.3', version: '>= 0.3.0')
+  dependency('cairo-gobject')
 ]
 
+if enable_goa
+  sources = sources + files(
+    'cc-background-grilo-miner.c',
+  )
+
+  deps += [
+    goa_dep,
+    dependency('grilo-0.3', version: '>= 0.3.0')
+  ]
+endif
+
 cflags += [
   '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir),
   '-DDATADIR="@0@"'.format(control_center_datadir),
diff '--exclude=.git' -urN a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build
--- a/panels/bluetooth/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/bluetooth/meson.build	2018-10-01 21:23:09.599462402 -0500
@@ -29,7 +29,13 @@
   export: true
 )
 
-deps = common_deps + [gnome_bluetooth_dep]
+deps = common_deps
+
+if enable_bluetooth
+  deps += [
+    gnome_bluetooth_dep
+  ]
+endif
 
 cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 
diff '--exclude=.git' -urN a/panels/color/meson.build b/panels/color/meson.build
--- a/panels/color/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/color/meson.build	2018-10-01 21:05:01.908493920 -0500
@@ -40,13 +40,18 @@
 )
 
 deps = common_deps + [
-  colord_dep,
   gnome_desktop_dep,
   m_dep,
-  dependency('colord-gtk', version: '>= 0.1.24'),
   dependency('libsoup-2.4')
 ]
 
+if enable_color
+  deps += [
+    colord_dep,
+    dependency('colord-gtk', version: '>= 0.1.24'),
+  ]
+endif
+
 cflags += [
   '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir),
   '-DBINDIR="@0@"'.format(control_center_bindir)
diff '--exclude=.git' -urN a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
--- a/panels/display/cc-display-panel.c	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/display/cc-display-panel.c	2018-10-01 21:53:49.119273148 -0500
@@ -33,7 +33,9 @@
 #include "cc-display-config-manager-dbus.h"
 #include "cc-display-config.h"
 #include "cc-display-arrangement.h"
+#ifdef BUILD_COLOR
 #include "cc-night-light-dialog.h"
+#endif /* BUILD_COLOR */
 #include "cc-display-resources.h"
 
 #define PANEL_PADDING   32
@@ -65,7 +67,9 @@
   GtkSizeGroup *rows_size_group;
   GtkWidget *stack;
 
+#ifdef BUILD_COLOR
   CcNightLightDialog *night_light_dialog;
+#endif /* BUILD_COLOR */
   GSettings *settings_color;
 
   UpClient *up_client;
@@ -106,8 +110,10 @@
 get_resolution_string (CcDisplayMode *mode);
 static const gchar *
 get_frequency_string (CcDisplayMode *mode);
+#ifdef BUILD_COLOR
 static GtkWidget *
 make_night_light_widget (CcDisplayPanel *panel);
+#endif /* BUILD_COLOR */
 static gboolean
 should_show_rotation (CcDisplayPanel *panel,
                       CcDisplayMonitor  *output);
@@ -272,7 +278,9 @@
   g_clear_object (&self->shell_cancellable);
   g_clear_object (&self->shell_proxy);
 
+#ifdef BUILD_COLOR
   g_clear_pointer (&self->night_light_dialog, gtk_widget_destroy);
+#endif /* BUILD_COLOR */
 
   G_OBJECT_CLASS (cc_display_panel_parent_class)->dispose (object);
 }
@@ -1044,7 +1052,9 @@
 
   gtk_container_add (GTK_CONTAINER (frame), make_output_ui (panel));
 
+#ifdef BUILD_COLOR
   gtk_container_add (GTK_CONTAINER (vbox), make_night_light_widget (panel));
+#endif /* BUILD_COLOR */
 
   g_clear_object (&panel->rows_size_group);
   return make_scrollable (vbox);
@@ -1296,7 +1306,9 @@
   g_signal_connect_object (panel, "current-output", G_CALLBACK (replace_current_output_ui),
                            frame, G_CONNECT_SWAPPED);
 
+#ifdef BUILD_COLOR
   gtk_container_add (GTK_CONTAINER (vbox), make_night_light_widget (panel));
+#endif /* BUILD_COLOR */
 
   g_clear_object (&panel->rows_size_group);
   return vbox;
@@ -1356,7 +1368,9 @@
   g_signal_connect_object (panel, "current-output", G_CALLBACK (replace_current_output_ui),
                            frame, G_CONNECT_SWAPPED);
 
+#ifdef BUILD_COLOR
   gtk_container_add (GTK_CONTAINER (vbox), make_night_light_widget (panel));
+#endif /* BUILD_COLOR */
 
   g_clear_object (&panel->rows_size_group);
   return vbox;
@@ -1492,7 +1506,9 @@
   gtk_container_add (GTK_CONTAINER (listbox),
                      make_mirror_resolution_row (panel, panel->current_output));
 
+#ifdef BUILD_COLOR
   gtk_container_add (GTK_CONTAINER (vbox), make_night_light_widget (panel));
+#endif /* BUILD_COLOR */
 
   g_clear_object (&panel->rows_size_group);
   return vbox;
@@ -1784,7 +1800,9 @@
   g_signal_connect_object (panel, "current-output", G_CALLBACK (replace_current_output_ui),
                            frame, G_CONNECT_SWAPPED);
 
+#ifdef BUILD_COLOR
   gtk_container_add (GTK_CONTAINER (vbox), make_night_light_widget (panel));
+#endif /* BUILD_COLOR */
 
   g_clear_object (&panel->rows_size_group);
   return make_scrollable (vbox);
@@ -2096,6 +2114,7 @@
   return !panel->has_accelerometer;
 }
 
+#ifdef BUILD_COLOR
 static void
 cc_display_panel_night_light_activated (CcDisplayPanel *panel)
 {
@@ -2104,6 +2123,7 @@
   gtk_window_set_transient_for (GTK_WINDOW (panel->night_light_dialog), toplevel);
   gtk_window_present (GTK_WINDOW (panel->night_light_dialog));
 }
+#endif /* BUILD_COLOR */
 
 static void
 mapped_cb (CcDisplayPanel *panel)
@@ -2233,6 +2253,7 @@
   update_has_accel (self);
 }
 
+#ifdef BUILD_COLOR
 static void
 night_light_sync_label (GtkWidget *label, GSettings *settings)
 {
@@ -2241,14 +2262,18 @@
                        /* TRANSLATORS: the state of the night light setting */
                        ret ? _("On") : _("Off"));
 }
+#endif /* BUILD_COLOR */
 
 static void
 settings_color_changed_cb (GSettings *settings, gchar *key, GtkWidget *label)
 {
+#ifdef BUILD_COLOR
   if (g_strcmp0 (key, "night-light-enabled") == 0)
     night_light_sync_label (label, settings);
+#endif /* BUILD_COLOR */
 }
 
+#ifdef BUILD_COLOR
 static GtkWidget *
 make_night_light_widget (CcDisplayPanel *self)
 {
@@ -2276,6 +2301,7 @@
   gtk_widget_set_margin_top (frame, SECTION_PADDING);
   return frame;
 }
+#endif /* BUILD_COLOR */
 
 static void
 session_bus_ready (GObject        *source,
@@ -2326,7 +2352,10 @@
   gtk_container_add (GTK_CONTAINER (self), self->stack);
   gtk_widget_show_all (self->stack);
 
+#ifdef BUILD_COLOR
   self->night_light_dialog = cc_night_light_dialog_new ();
+#endif /* BUILD_COLOR */
+
   self->settings_color = g_settings_new ("org.gnome.settings-daemon.plugins.color");
 
   self->up_client = up_client_new ();
diff '--exclude=.git' -urN a/panels/display/meson.build b/panels/display/meson.build
--- a/panels/display/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/display/meson.build	2018-10-01 21:39:52.078557239 -0500
@@ -24,16 +24,26 @@
   'cc-display-config-dbus.c',
   'cc-display-config-manager-dbus.c',
   'cc-display-config-manager.c',
-  'cc-night-light-dialog.c',
-  'cc-night-light-widget.c',
 )
 
+if enable_color
+  sources += files(
+    'cc-night-light-dialog.c',
+    'cc-night-light-widget.c',
+  )
+endif
+
 resource_data = files(
-  'cc-night-light-dialog.ui',
   'icons/16x16/sunset.png',
   'icons/16x16/sunrise.png'
 )
 
+if enable_color
+  resource_data += files(
+    'cc-night-light-dialog.ui',
+  )
+endif
+
 sources += gnome.compile_resources(
   'cc-' + cappletname + '-resources',
   cappletname + '.gresource.xml',
@@ -44,12 +54,17 @@
 )
 
 deps = common_deps + [
-  colord_dep,
   gnome_desktop_dep,
   m_dep,
   upower_glib_dep
 ]
 
+if enable_color
+  deps += [
+    colord_dep
+  ]
+endif
+
 cflags += [
   '-DDATADIR="@0@"'.format(control_center_datadir),
   '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
diff '--exclude=.git' -urN a/panels/meson.build b/panels/meson.build
--- a/panels/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/meson.build	2018-10-01 21:19:47.962825390 -0500
@@ -2,16 +2,13 @@
 
 panels = [
   'background',
-  'color',
   'datetime',
   'display',
   'info',
   'keyboard',
   'mouse',
   'notifications',
-  'online-accounts',
   'power',
-  'printers',
   'privacy',
   'region',
   'search',
@@ -21,18 +18,48 @@
   'user-accounts'
 ]
 
-if host_is_linux
-  panels += ['network']
+if enable_color
+  panels += [
+    'color'
+  ]
 endif
 
-if host_is_linux_not_s390
+if enable_goa
+  panels += [
+    'online-accounts'
+  ]
+endif
+
+if enable_cups
   panels += [
-    'bluetooth',
-    'thunderbolt',
-    'wacom'
+    'printers'
   ]
 endif
 
+if host_is_linux and enable_networkmanager
+  panels += ['network']
+endif
+
+if host_is_linux_not_s390
+  if enable_bluetooth
+    panels += [
+      'bluetooth'
+    ]
+  endif
+
+  if enable_thunderbolt
+    panels += [
+      'thunderbolt'
+    ]
+  endif
+
+  if enable_wacom
+    panels += [
+      'wacom'
+    ]
+  endif
+endif
+
 panels_list = []
 panels_libs = []
 foreach cappletname: panels
diff '--exclude=.git' -urN a/panels/network/meson.build b/panels/network/meson.build
--- a/panels/network/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/network/meson.build	2018-10-01 21:13:51.951903301 -0500
@@ -1,8 +1,14 @@
-deps = common_deps + network_manager_deps + [
+deps = common_deps + [
   polkit_gobject_dep,
   dependency('gmodule-2.0')
 ]
 
+if enable_networkmanager
+  deps += [
+    network_manager_deps
+  ]
+endif
+
 subdir('wireless-security')
 subdir('connection-editor')
 
@@ -77,4 +83,4 @@
   c_args: cflags,
   link_with: libconnection_editor
 )
-panels_libs += network_panel_lib
\ No newline at end of file
+panels_libs += network_panel_lib
diff '--exclude=.git' -urN a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build
--- a/panels/online-accounts/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/online-accounts/meson.build	2018-10-01 21:04:43.617341094 -0500
@@ -29,10 +29,14 @@
   export: true
 )
 
-deps = common_deps + [
-  goa_dep,
-  dependency('goa-backend-1.0', version: goa_req_version)
-]
+deps = common_deps
+
+if enable_goa
+  deps += [
+    goa_dep,
+    dependency('goa-backend-1.0', version: goa_req_version)
+  ]
+endif
 
 cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 
diff '--exclude=.git' -urN a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
--- a/panels/power/cc-power-panel.c	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/power/cc-power-panel.c	2018-10-01 19:33:15.774751197 -0500
@@ -1937,7 +1937,7 @@
                     G_CALLBACK (wifi_switch_changed), self);
 #endif
 
-#ifdef HAVE_BLUETOOTH
+#ifdef BUILD_BLUETOOTH
 
   self->bt_rfkill = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
                                                               G_DBUS_PROXY_FLAGS_NONE,
diff '--exclude=.git' -urN a/panels/power/meson.build b/panels/power/meson.build
--- a/panels/power/meson.build	2018-09-25 19:27:31.000000000 -0500
+++ b/panels/power/meson.build	2018-10-01 21:22:23.041084697 -0500
@@ -36,11 +36,11 @@
 
 cflags += '-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)
 
-if host_is_linux
+if host_is_linux and enable_networkmanager
   deps += network_manager_deps
 endif
 
-if host_is_linux_not_s390
+if host_is_linux_not_s390 and enable_bluetooth
   deps += gnome_bluetooth_dep
 endif
 
diff '--exclude=.git' -urN a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
--- a/panels/user-accounts/meson.build	2018-09-25 19:27:32.000000000 -0500
+++ b/panels/user-accounts/meson.build	2018-10-01 21:05:31.343739760 -0500
@@ -156,21 +156,31 @@
   'um-user-panel.c'
 )
 
-# Kerberos support
-krb_dep = dependency('krb5', required: false)
-assert(krb_dep.found(), 'kerberos libraries not found in your path')
+# Optional dependency for kerberos support
+enable_krb = get_option('krb')
+if enable_krb
+  krb_dep = dependency('krb5', required: false)
+  assert(krb_dep.found(), 'kerberos libraries not found in your path')
+endif
+config_h.set('HAVE_KERBEROS', enable_krb,
+             description: 'Defined if kerberos support is enabled')
 
 deps = common_deps + [
   accounts_dep,
   gdk_pixbuf_dep,
   gnome_desktop_dep,
   liblanguage_dep,
-  krb_dep,
   m_dep,
   polkit_gobject_dep,
   dependency('pwquality', version: '>= 1.2.2')
 ]
 
+if enable_krb
+  deps += [
+    krb_dep
+  ]
+endif
+
 if enable_cheese
   deps += cheese_deps
 endif
diff '--exclude=.git' -urN a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
--- a/panels/user-accounts/um-realm-manager.c	2018-09-25 19:27:32.000000000 -0500
+++ b/panels/user-accounts/um-realm-manager.c	2018-10-01 19:28:35.219571352 -0500
@@ -22,7 +22,9 @@
 
 #include "um-realm-manager.h"
 
+#ifdef HAVE_KERBEROS
 #include <krb5/krb5.h>
+#endif
 
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -613,6 +615,7 @@
         g_slice_free (LoginClosure, login);
 }
 
+#ifdef HAVE_KERBEROS
 static krb5_error_code
 login_perform_kinit (krb5_context k5,
                      const gchar *realm,
@@ -676,6 +679,7 @@
 
         return code;
 }
+#endif /* HAVE_KERBEROS */
 
 static void
 kinit_thread_func (GTask *task,
@@ -683,6 +687,7 @@
                    gpointer task_data,
                    GCancellable *cancellable)
 {
+#ifdef HAVE_KERBEROS
         LoginClosure *login = task_data;
         krb5_context k5 = NULL;
         krb5_error_code code;
@@ -763,6 +768,10 @@
                 krb5_free_context (k5);
 
         g_object_unref (task);
+#else /* HAVE_KERBEROS */
+        g_task_return_new_error (task, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
+                                 _("gnome-control-center was built without kerberos support"));
+#endif
 }
 
 void
diff '--exclude=.git' -urN a/panels/wacom/meson.build b/panels/wacom/meson.build
--- a/panels/wacom/meson.build	2018-09-25 19:27:32.000000000 -0500
+++ b/panels/wacom/meson.build	2018-10-01 21:07:15.023604743 -0500
@@ -1,10 +1,16 @@
-deps = wacom_deps + [
+deps = [
   gnome_desktop_dep,
   gnome_settings_dep,
   x11_dep,
   xi_dep
 ]
 
+if enable_wacom
+  deps += [
+    wacom_deps
+  ]
+endif
+
 cflags += ['-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir)]
 
 test_cflags = cflags + ['-DFAKE_AREA']
diff '--exclude=.git' -urN a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
--- a/shell/cc-panel-loader.c	2018-09-25 19:27:32.000000000 -0500
+++ b/shell/cc-panel-loader.c	2018-10-01 19:28:56.129733745 -0500
@@ -34,7 +34,9 @@
 #ifdef BUILD_BLUETOOTH
 extern GType cc_bluetooth_panel_get_type (void);
 #endif /* BUILD_BLUETOOTH */
+#ifdef BUILD_COLOR
 extern GType cc_color_panel_get_type (void);
+#endif /* BUILD_COLOR */
 extern GType cc_date_time_panel_get_type (void);
 extern GType cc_display_panel_get_type (void);
 extern GType cc_info_overview_panel_get_type (void);
@@ -47,9 +49,13 @@
 extern GType cc_wifi_panel_get_type (void);
 #endif /* BUILD_NETWORK */
 extern GType cc_notifications_panel_get_type (void);
+#ifdef BUILD_ONLINE_ACCOUNTS
 extern GType cc_goa_panel_get_type (void);
+#endif /* BUILD_ONLINE_ACCOUNTS */
 extern GType cc_power_panel_get_type (void);
+#ifdef BUILD_PRINTERS
 extern GType cc_printers_panel_get_type (void);
+#endif /* BUILD_PRINTERS */
 extern GType cc_privacy_panel_get_type (void);
 extern GType cc_region_panel_get_type (void);
 extern GType cc_search_panel_get_type (void);
@@ -91,7 +97,9 @@
 #ifdef BUILD_BLUETOOTH
   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type,            NULL),
 #endif
+#ifdef BUILD_COLOR
   PANEL_TYPE("color",            cc_color_panel_get_type,                NULL),
+#endif
   PANEL_TYPE("datetime",         cc_date_time_panel_get_type,            NULL),
   PANEL_TYPE("display",          cc_display_panel_get_type,              NULL),
   PANEL_TYPE("info-overview",    cc_info_overview_panel_get_type,        NULL),
@@ -104,9 +112,13 @@
   PANEL_TYPE("wifi",             cc_wifi_panel_get_type,                 cc_wifi_panel_static_init_func),
 #endif
   PANEL_TYPE("notifications",    cc_notifications_panel_get_type,        NULL),
+#ifdef BUILD_ONLINE_ACCOUNTS
   PANEL_TYPE("online-accounts",  cc_goa_panel_get_type,                  NULL),
+#endif
   PANEL_TYPE("power",            cc_power_panel_get_type,                NULL),
+#ifdef BUILD_PRINTERS
   PANEL_TYPE("printers",         cc_printers_panel_get_type,             NULL),
+#endif
   PANEL_TYPE("privacy",          cc_privacy_panel_get_type,              NULL),
   PANEL_TYPE("region",           cc_region_panel_get_type,               NULL),
   PANEL_TYPE("search",           cc_search_panel_get_type,               NULL),
diff '--exclude=.git' -urN a/shell/meson.build b/shell/meson.build
--- a/shell/meson.build	2018-09-25 19:27:32.000000000 -0500
+++ b/shell/meson.build	2018-10-01 21:08:15.984112655 -0500
@@ -81,7 +81,7 @@
   shell_deps += cheese_deps
 endif
 
-if host_is_linux_not_s390
+if host_is_linux_not_s390 and enable_wacom
   shell_deps += wacom_deps
 endif
 
diff '--exclude=.git' -urN a/tests/meson.build b/tests/meson.build
--- a/tests/meson.build	2018-09-25 19:27:32.000000000 -0500
+++ b/tests/meson.build	2018-10-01 21:25:14.601475654 -0500
@@ -1,7 +1,9 @@
 subdir('common')
 #subdir('datetime')
-#if host_is_linux
+#if host_is_linux and enable_networkmanager
 #  subdir('network')
 #endif
-subdir('printers')
+if enable_cups
+  subdir('printers')
+endif
 subdir('info')