[gnome-flashback/test2] build: remove --with-system-indicators option

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 07756de4508e49991c27816d3c0e69b2ab216415
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Jan 22 21:03:44 2020 +0200

    build: remove --with-system-indicators option
    
    System indicators are not optional. Also add GSettings override
    for default-layout key.

 .gitlab-ci.yml                                   |  1 +
 configure.ac                                     | 41 +++++++-----------------
 data/gnome-panel/Makefile.am                     |  2 --
 data/schemas/00_gnome-flashback.gschema.override |  3 ++
 data/schemas/Makefile.am                         | 11 -------
 system-indicators/Makefile.am                    |  2 --
 6 files changed, 16 insertions(+), 44 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6af7917..2f9e148 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ build-ubuntu:
                       libglib2.0-dev
                       libgnome-bluetooth-dev
                       libgnome-desktop-3-dev
+                      libgnome-panel-dev
                       libgtk-3-dev
                       libibus-1.0-dev
                       libpam0g-dev
diff --git a/configure.ac b/configure.ac
index 54d8917..77bf6b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,7 @@ dnl **************************************************************************
 GDK_PIXBUF_REQUIRED=2.32.2
 GTK_REQUIRED=3.22.0
 LIBGNOME_DESKTOP_REQUIRED=3.12.0
+LIBGNOME_PANEL_REQUIRED=3.35.2
 CANBERRA_REQUIRED=0.13
 GLIB_REQUIRED=2.44.0
 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=3.31.0
@@ -311,36 +312,19 @@ dnl **************************************************************************
 dnl System indicators
 dnl **************************************************************************
 
-AC_ARG_WITH([system-indicators],
-            [AS_HELP_STRING([--with-system-indicators], [build with System indicators])],
-            [with_system_indicators="$withval"], [with_system_indicators="auto"])
+GNOME_PANEL_LAYOUTS_DIR=`$PKG_CONFIG --variable=layoutsdir libgnome-panel`
+AC_SUBST([GNOME_PANEL_LAYOUTS_DIR], [$GNOME_PANEL_LAYOUTS_DIR])
 
-AS_IF([test "x$with_system_indicators" != "xno"], [
-  PKG_CHECK_EXISTS([libgnome-panel],
-                   [found_libgnome_panel="yes"], [found_libgnome_panel="no"])
+GNOME_PANEL_MODULES_DIR=`$PKG_CONFIG --variable=modulesdir libgnome-panel`
+AC_SUBST([GNOME_PANEL_MODULES_DIR], [$GNOME_PANEL_MODULES_DIR])
 
-  AS_IF([test "x$found_libgnome_panel" = "xyes"], [
-    GNOME_PANEL_LAYOUTS_DIR=`$PKG_CONFIG --variable=layoutsdir libgnome-panel`
-    AC_SUBST([GNOME_PANEL_LAYOUTS_DIR], [$GNOME_PANEL_LAYOUTS_DIR])
-
-    GNOME_PANEL_MODULES_DIR=`$PKG_CONFIG --variable=modulesdir libgnome-panel`
-    AC_SUBST([GNOME_PANEL_MODULES_DIR], [$GNOME_PANEL_MODULES_DIR])
-
-    PKG_CHECK_MODULES([SYSTEM_INDICATORS], [
-      gio-unix-2.0 >= $GLIB_REQUIRED
-      gnome-bluetooth-1.0
-      libcanberra-gtk3 >= $CANBERRA_REQUIRED
-      libgnome-panel
-      upower-glib
-    ])
-  ], [
-    AS_IF([test "x$with_system_indicators" = "xyes"], [
-      AC_MSG_ERROR([System indicators requested but libgnome-panel not found])
-    ])
-  ])
-], [found_libgnome_panel=no])
-
-AM_CONDITIONAL(WITH_SYSTEM_INDICATORS, [test "x$found_libgnome_panel" = "xyes"])
+PKG_CHECK_MODULES([SYSTEM_INDICATORS], [
+  gio-unix-2.0 >= $GLIB_REQUIRED
+  gnome-bluetooth-1.0
+  libcanberra-gtk3 >= $CANBERRA_REQUIRED
+  libgnome-panel >= $LIBGNOME_PANEL_REQUIRED
+  upower-glib
+])
 
 dnl **************************************************************************
 dnl Compiz session
@@ -454,6 +438,5 @@ echo "  libdir ......................: ${libdir}"
 echo "  sysconfdir ..................: ${sysconfdir}"
 echo "  libexecdir ..................: ${libexecdir}"
 echo ""
-echo "  System indicators ...........: ${found_libgnome_panel}"
 echo "  Compiz session ..............: ${found_compiz}"
 echo ""
diff --git a/data/gnome-panel/Makefile.am b/data/gnome-panel/Makefile.am
index 17c4a87..6cecf58 100644
--- a/data/gnome-panel/Makefile.am
+++ b/data/gnome-panel/Makefile.am
@@ -4,10 +4,8 @@ layout_files = \
        gnome-flashback.layout \
        $(NULL)
 
-if WITH_SYSTEM_INDICATORS
 layoutsdir = $(GNOME_PANEL_LAYOUTS_DIR)
 layouts_DATA = $(layout_files)
-endif
 
 EXTRA_DIST = \
        $(layout_files) \
diff --git a/data/schemas/00_gnome-flashback.gschema.override 
b/data/schemas/00_gnome-flashback.gschema.override
index d298ee7..35d8d65 100644
--- a/data/schemas/00_gnome-flashback.gschema.override
+++ b/data/schemas/00_gnome-flashback.gschema.override
@@ -1,2 +1,5 @@
 [org.gnome.desktop.wm.preferences:GNOME-Flashback]
 button-layout='appmenu:minimize,maximize,close'
+
+[org.gnome.gnome-panel.general:GNOME-Flashback]
+default-layout='gnome-flashback'
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index 7be8109..70c69c1 100644
--- a/data/schemas/Makefile.am
+++ b/data/schemas/Makefile.am
@@ -13,13 +13,8 @@ gsettings_SCHEMAS = \
        org.gnome.gnome-flashback.desktop.gschema.xml \
        org.gnome.gnome-flashback.desktop.background.gschema.xml \
        org.gnome.gnome-flashback.desktop.icons.gschema.xml \
-       $(NULL)
-
-if WITH_SYSTEM_INDICATORS
-gsettings_SCHEMAS += \
        org.gnome.gnome-flashback.system-indicators.input-sources.gschema.xml \
        $(NULL)
-endif
 
 @GSETTINGS_RULES@
 
@@ -28,12 +23,6 @@ EXTRA_DIST = \
        $(gsettings_SCHEMAS) \
        $(NULL)
 
-if !WITH_SYSTEM_INDICATORS
-EXTRA_DIST += \
-       org.gnome.gnome-flashback.system-indicators.input-sources.gschema.xml \
-       $(NULL)
-endif
-
 CLEANFILES = \
        *.gschema.valid \
        $(NULL)
diff --git a/system-indicators/Makefile.am b/system-indicators/Makefile.am
index 57536ea..2806e62 100644
--- a/system-indicators/Makefile.am
+++ b/system-indicators/Makefile.am
@@ -1,6 +1,5 @@
 NULL =
 
-if WITH_SYSTEM_INDICATORS
 system_indicators_libdir = $(GNOME_PANEL_MODULES_DIR)
 system_indicators_lib_LTLIBRARIES = system_indicators.la
 
@@ -50,6 +49,5 @@ system_indicators_la_LDFLAGS = \
        $(WARN_LDFLAGS) \
        $(AM_LDFLAGS) \
        $(NULL)
-endif
 
 -include $(top_srcdir)/git.mk