[gnome-panel/merge-gnome-applets] Fix geyes build

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

commit 8ed8a07a5261ec1c2eb9d520a6ad1a802bd0b694
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue May 27 23:38:21 2014 +0300

    Fix geyes build

 applets/Makefile.am        |    1 +
 applets/geyes/Makefile.am  |    8 ++++++--
 configure.ac               |    4 ++++
 gnome-applets/Makefile.am  |    1 -
 gnome-applets/configure.ac |    4 ----
 5 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index b8b7a32..01ad964 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS =                       \
        clock                   \
        drivemount \
        fish                    \
+       geyes \
        notification_area       \
        wncklet
 
diff --git a/applets/geyes/Makefile.am b/applets/geyes/Makefile.am
index f0b59c4..d124e58 100644
--- a/applets/geyes/Makefile.am
+++ b/applets/geyes/Makefile.am
@@ -3,8 +3,11 @@ SUBDIRS = help themes
 AM_CPPFLAGS =                                          \
        -I.                                             \
        -I$(srcdir)                                     \
-       $(GNOME_APPLETS_CFLAGS)                         \
+       $(LIBPANEL_APPLET_CFLAGS)                               \
        -I$(includedir)                                 \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"   \
        -DGEYES_MENU_UI_DIR=\""$(uidir)"\"
 
@@ -16,7 +19,8 @@ geyes_applet2_SOURCES =       \
        geyes.h
 
 geyes_applet2_LDADD =          \
-       $(GNOME_APPLETS_LIBS)   \
+       ../../libpanel-applet/libpanel-applet-4.la \
+       $(LIBPANEL_APPLET_LIBS) \
        $(LIBM)
 
 appletdir       = $(datadir)/gnome-panel/4.0/applets
diff --git a/configure.ac b/configure.ac
index 16bb956..99cf403 100644
--- a/configure.ac
+++ b/configure.ac
@@ -603,6 +603,9 @@ applets/cpufreq/src/Makefile
 applets/drivemount/help/Makefile
 applets/drivemount/Makefile
 applets/fish/Makefile
+applets/geyes/help/Makefile
+applets/geyes/Makefile
+applets/geyes/themes/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
 doc/Makefile
@@ -667,6 +670,7 @@ echo "
                 - using PolicyKit      $HAVE_POLKIT
                 - enabling suid bit    $suid
              - drivemount              always
+             - geyes                   always
 
             Using DBUS:                $HAVE_DBUS
             Using HAL:                 $HAVE_HAL
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index d88064f..e39ec2f 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -25,7 +25,6 @@ mixer_applet_SUBDIR = mixer
 endif
 
 always_built_SUBDIRS =  \
-       geyes           \
        mini-commander  \
        stickynotes     \
        trashapplet     \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index ff87551..f72f426 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -419,9 +419,6 @@ AC_OUTPUT([
 gnome-applets.spec
 Makefile
 po/Makefile.in
-geyes/help/Makefile
-geyes/Makefile
-geyes/themes/Makefile
 gweather/help/Makefile
 gweather/Makefile
 invest-applet/data/art/Makefile
@@ -459,7 +456,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - geyes                        always
         - gweather                     $build_libgweather_applets
         - invest-applet                $BUILD_INVEST_APPLET
         - mini-commander               $enable_mini_commander