[gnome-applets/wip/muktupavels/accessx-status] build: always build accessx-status applet

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

commit 63dbc1d0f7ce31c437d7894fd6e1563fb5b27a14
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Mar 30 16:17:07 2020 +0300

    build: always build accessx-status applet

 .gitlab-ci.yml                    |  2 ++
 Makefile.am                       |  5 +----
 configure.ac                      | 13 ++-----------
 data/icons/48x48/apps/Makefile.am |  7 +------
 help/Makefile.am                  |  7 +------
 5 files changed, 7 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9e6c5027..d22d1f28b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,7 @@ build-ubuntu:
                       libwnck-3-dev
                       libx11-dev
                       libxml2-dev
+                      x11proto-dev
                       yelp-tools
   script:
     - ./autogen.sh --disable-Werror
@@ -81,6 +82,7 @@ coverity:
                       libwnck-3-dev
                       libx11-dev
                       libxml2-dev
+                      x11proto-dev
                       yelp-tools
   script:
     - curl https://scan.coverity.com/download/linux64
diff --git a/Makefile.am b/Makefile.am
index 6b2580526..4ccc06f56 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,11 @@
 NULL =
 
-if APPLET_ACCESSX
-accessx_status_SUBDIR = accessx-status
-endif
-
 if HAVE_TRACKER_SEARCH_BAR
 tracker_search_bar_SUBDIR = tracker-search-bar
 endif
 
 always_built_SUBDIRS =  \
+       accessx-status \
        drivemount      \
        geyes           \
        mini-commander \
diff --git a/configure.ac b/configure.ac
index 578edcad5..896bace12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,16 +206,7 @@ dnl ***************************************************************************
 dnl *** keyboard accessibility status applet check                          ***
 dnl ***************************************************************************
 
-savecppflags=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-AC_CHECK_HEADER(X11/extensions/XKB.h, HAVE_XKB=true, HAVE_XKB=false)
-AC_SUBST(HAVE_XKB)
-
-AM_CONDITIONAL(APPLET_ACCESSX, $HAVE_XKB)
-if test "x$APPLET_ACCESSX" = "xtrue"; then
-  AC_MSG_WARN([*** keyboard accessibility status applet will not be built ***])
-fi
-CPPFLAGS=$savecppflags
+PKG_CHECK_MODULES(ACCESSX_STATUS, xproto)
 
 dnl ***************************************************************************
 dnl *** cpufreq applet check                                                ***
@@ -434,7 +425,7 @@ echo "  libgnome-panel"
 echo "    modulesdir ....................: ${GNOME_PANEL_MODULES_DIR}"
 echo ""
 echo "  Applets"
-echo "    accessx-status ................: $HAVE_XKB"
+echo "    accessx-status ................: always"
 echo "    batstat .......................: always"
 echo "    brightness ....................: always"
 echo "    charpick ......................: always"
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
index a95df916c..c1c4c301e 100644
--- a/data/icons/48x48/apps/Makefile.am
+++ b/data/icons/48x48/apps/Makefile.am
@@ -6,18 +6,13 @@ context = apps
 
 iconsdir = $(themedir)/$(size)/$(context)
 icons_DATA = \
+       ax-applet.png \
        gnome-brightness-applet.png \
        gnome-inhibit-applet.png \
        gnome-mini-commander.png \
        netspeed-applet.png \
        $(NULL)
 
-if APPLET_ACCESSX
-icons_DATA += \
-       ax-applet.png \
-       $(NULL)
-endif
-
 EXTRA_DIST = \
        $(icons_DATA) \
        $(NULL)
diff --git a/help/Makefile.am b/help/Makefile.am
index 832208fd6..3abc26850 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 SUBDIRS = \
+       accessx-status \
        battstat \
        charpick \
        drivemount \
@@ -13,12 +14,6 @@ SUBDIRS = \
        trash \
        $(NULL)
 
-if APPLET_ACCESSX
-SUBDIRS += \
-       accessx-status \
-       $(NULL)
-endif
-
 if BUILD_CPUFREQ_APPLET
 SUBDIRS += \
        cpufreq \