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

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

commit d799c4cad1cca50a3600ac3da6b858d59a9b2931
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 27 21:32:03 2014 +0300

    Fix charpick applet build

 applets/Makefile.am          |    1 +
 applets/charpick/Makefile.am |    8 ++++++--
 configure.ac                 |   17 +++++++++++++++++
 gnome-applets/Makefile.am    |    1 -
 gnome-applets/configure.ac   |   18 ------------------
 5 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index d91426a..43b6bb5 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS =                      \
+       charpick \
        clock                   \
        fish                    \
        notification_area       \
diff --git a/applets/charpick/Makefile.am b/applets/charpick/Makefile.am
index d9a6ef4..ff355a6 100644
--- a/applets/charpick/Makefile.am
+++ b/applets/charpick/Makefile.am
@@ -3,8 +3,11 @@ SUBDIRS = help
 AM_CPPFLAGS =                                  \
        -I.                                     \
        -I$(srcdir)                             \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"   \
-       $(GNOME_APPLETS_CFLAGS)         \
+       $(LIBPANEL_APPLET_CFLAGS)               \
        $(GUCHARMAP_CFLAGS)
 
 libexec_PROGRAMS = charpick_applet2
@@ -14,7 +17,8 @@ charpick_applet2_SOURCES = charpick.c \
                           properties.c
 
 charpick_applet2_LDADD = \
-                      $(GNOME_APPLETS_LIBS)    \
+                      ../../libpanel-applet/libpanel-applet-4.la       \
+                      $(LIBPANEL_APPLET_LIBS)  \
                       $(GUCHARMAP_LIBS)
 
 appletdir       = $(datadir)/gnome-panel/4.0/applets
diff --git a/configure.ac b/configure.ac
index b74748c..388ca90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,7 @@ GWEATHER_REQUIRED=3.5.1
 DBUS_GLIB_REQUIRED=0.80
 DCONF_REQUIRED=0.13.4
 LIBRSVG_REQUIRED=2.36.2
+GUCHARMAP3_REQUIRED=2.33.0
 
 dnl pkg-config dependency checks
 
@@ -309,6 +310,18 @@ case $host in
        ;;
 esac
 
+dnl -- check for gucharmap (optional) -----------------------------------------
+
+PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
+                  [have_gucharmap=yes],[have_gucharmap=no])
+if test "$have_gucharmap" = "yes"; then
+       AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
+else
+  AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
+fi
+AC_SUBST(GUCHARMAP_CFLAGS)
+AC_SUBST(GUCHARMAP_LIBS)
+
 dnl ***************************************************************************
 dnl *** keyboard accessibility status applet check                          ***
 dnl ***************************************************************************
@@ -444,6 +457,8 @@ applets/battstat/apmlib/Makefile
 applets/battstat/help/Makefile
 applets/battstat/Makefile
 applets/battstat/sounds/Makefile
+applets/charpick/help/Makefile
+applets/charpick/Makefile
 applets/clock/Makefile
 applets/clock/pixmaps/Makefile
 applets/fish/Makefile
@@ -504,5 +519,7 @@ echo "
             Building:
              - accessx-status          $HAVE_XKB
              - battstat                $build_battstat_applet
+             - charpick                always
+                - gucharmap support    $have_gucharmap
 
 "
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 85f01ab..8a61dfa 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -29,7 +29,6 @@ mixer_applet_SUBDIR = mixer
 endif
 
 always_built_SUBDIRS =  \
-       charpick        \
        drivemount      \
        geyes           \
        mini-commander  \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index e44be52..ceebaa9 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -28,7 +28,6 @@ DBUS_GLIB_REQUIRED=0.74
 GNOME_ICON_THEME_REQUIRED=2.15.91
 LIBXML_REQUIRED=2.5.0
 GWEATHER_REQUIRED=3.5.0
-GUCHARMAP3_REQUIRED=2.33.0
 POLKIT_REQUIRED=0.92
 NETWORKMANAGER_REQUIRED=0.7
 GST10_REQUIRED=0.10.2
@@ -245,19 +244,6 @@ AC_SUBST(UPOWER_LIBS)
 AC_SUBST(LIBM)
 
 
-
-dnl -- check for gucharmap (optional) -----------------------------------------
-
-PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
-                  [have_gucharmap=yes],[have_gucharmap=no])
-if test "$have_gucharmap" = "yes"; then
-       AC_DEFINE([HAVE_GUCHARMAP],[1],[Gucharmap Available])
-else
-  AC_MSG_WARN([*** 'charpick' applet will not be built with gucharmap support ***])
-fi
-AC_SUBST(GUCHARMAP_CFLAGS)
-AC_SUBST(GUCHARMAP_LIBS)
-
 dnl -- check for Python/GNOME modules (optional) ------------------------------
 PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
 
@@ -569,8 +555,6 @@ AC_OUTPUT([
 gnome-applets.spec
 Makefile
 po/Makefile.in
-charpick/help/Makefile
-charpick/Makefile
 cpufreq/help/Makefile
 cpufreq/Makefile
 cpufreq/pixmaps/Makefile
@@ -618,8 +602,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - charpick                     always
-               - gucharmap support     $have_gucharmap
         - cpufreq                      $build_cpufreq_applet
                - building selector     $enable_selector
                - using PolicyKit       $HAVE_POLKIT