[gnome-panel/merge-gnome-applets] Fix accessx-applet build

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

commit 2f8a63a031790bfdf40750e100db440ab1610d7f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 27 20:48:28 2014 +0300

    Fix accessx-applet build

 applets/Makefile.am                |    4 ++++
 applets/accessx-status/Makefile.am |    8 ++++++--
 configure.ac                       |   22 ++++++++++++++++++++++
 gnome-applets/Makefile.am          |    5 -----
 gnome-applets/configure.ac         |   20 --------------------
 5 files changed, 32 insertions(+), 27 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index e1e952d..1c8a66f 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -4,4 +4,8 @@ SUBDIRS =                       \
        notification_area       \
        wncklet
 
+if APPLET_ACCESSX
+SUBDIRS += accessx-status
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/applets/accessx-status/Makefile.am b/applets/accessx-status/Makefile.am
index b98c5cc..c2283dd 100644
--- a/applets/accessx-status/Makefile.am
+++ b/applets/accessx-status/Makefile.am
@@ -1,10 +1,13 @@
 SUBDIRS = help pixmaps
 
 AM_CPPFLAGS = \
-       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBPANEL_APPLET_CFLAGS) \
        $(GIO_CFLAGS)           \
        $(GIO_UNIX_CFLAGS)      \
        $(WARN_CFLAGS)          \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" \
        -DACCESSX_MENU_UI_DIR=\""$(uidir)"\"
 
@@ -15,7 +18,8 @@ accessx_status_applet_SOURCES = \
        applet.h
 
 accessx_status_applet_LDADD =  \
-       $(GNOME_APPLETS_LIBS)   \
+       ../../libpanel-applet/libpanel-applet-4.la      \
+       $(LIBPANEL_APPLET_LIBS) \
        $(GIO_LIBS)             \
        $(GIO_UNIX_LIBS)        \
         $(X_LIBS)
diff --git a/configure.ac b/configure.ac
index bec78d4..6f82eed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -309,6 +309,21 @@ case $host in
        ;;
 esac
 
+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
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -328,6 +343,9 @@ libpanel-applet/libpanelapplet-4.0.pc
 libpanel-applet/libpanelapplet-4.0-uninstalled.pc
 po/Makefile.in
 applets/Makefile
+applets/accessx-status/help/Makefile
+applets/accessx-status/Makefile
+applets/accessx-status/pixmaps/Makefile
 applets/clock/Makefile
 applets/clock/pixmaps/Makefile
 applets/fish/Makefile
@@ -384,4 +402,8 @@ echo "
         Build introspection support:   ${found_introspection}
         Build gtk-doc documentation:   ${enable_gtk_doc}
 
+        Applets (from gnome-applets package):
+            Building:
+             - accessx-status          $HAVE_XKB
+
 "
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 88c1a55..db342a2 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -20,10 +20,6 @@ if BUILD_BATTSTAT_APPLET
 battstat_SUBDIR = battstat
 endif
 
-if APPLET_ACCESSX
-accessx_status_SUBDIR = accessx-status
-endif
-
 if BUILD_CPUFREQ_APPLET
 cpufreq_SUBDIR = cpufreq
 endif
@@ -53,7 +49,6 @@ SUBDIRS = \
        $(libgweather_SUBDIRS)  \
        $(vfs_SUBDIRS)          \
        $(battstat_SUBDIR)      \
-       $(accessx_status_SUBDIR)\
        $(invest_applet_SUBDIR) \
        $(cpufreq_SUBDIR) \
        $(mixer_applet_SUBDIR)
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index 4a2621b..e69dbb3 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -464,21 +464,6 @@ enable_stickynotes="yes"
 AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
 
 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
-
-dnl ***************************************************************************
 dnl *** modemlights applet check                                            ***
 dnl ***************************************************************************
 
@@ -678,9 +663,6 @@ AC_OUTPUT([
 gnome-applets.spec
 Makefile
 po/Makefile.in
-accessx-status/help/Makefile
-accessx-status/Makefile
-accessx-status/pixmaps/Makefile
 battstat/apmlib/Makefile
 battstat/help/Makefile
 battstat/Makefile
@@ -734,8 +716,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-       Building:
-        - accessx-status               $HAVE_XKB
         - battstat                     $build_battstat_applet
         - charpick                     always
                - gucharmap support     $have_gucharmap