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

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

commit c92632b4f6496e93a8246070b57e265369d53a9e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 00:11:25 2014 +0300

    Fix invest-applet build

 applets/Makefile.am        |    4 ++++
 configure.ac               |   18 ++++++++++++++++++
 gnome-applets/Makefile.am  |    5 -----
 gnome-applets/configure.ac |   18 ------------------
 4 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index b70ad4a..cf3b3a5 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -23,4 +23,8 @@ if BUILD_LIBGWEATHER_APPLETS
 SUBDIRS += gweather
 endif
 
+if BUILD_INVEST_APPLET
+SUBDIRS += invest-applet
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 3466b25..08489fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ IT_PROG_INTLTOOL([0.40.6])
 AC_PROG_CC
 
 AM_PATH_PYTHON
+AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
+
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
@@ -436,6 +438,9 @@ AC_SUBST(UPOWER_CFLAGS)
 AC_SUBST(UPOWER_LIBS)
 AC_SUBST(LIBM)
 
+dnl -- check for Python/GNOME modules (optional) ------------------------------
+PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
+
 dnl -- check for gucharmap (optional) -----------------------------------------
 
 PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED],
@@ -598,6 +603,12 @@ AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes")
 AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
 
 dnl ***************************************************************************
+dnl *** invest-applet specific checks                                       ***
+dnl ***************************************************************************
+
+AM_CONDITIONAL(BUILD_INVEST_APPLET, test x$HAVE_PYGOBJECT = xyes)
+
+dnl ***************************************************************************
 dnl *** Set install directories                                             ***
 dnl ***************************************************************************
 iconsdir="${datadir}/icons"
@@ -676,6 +687,12 @@ applets/geyes/Makefile
 applets/geyes/themes/Makefile
 applets/gweather/help/Makefile
 applets/gweather/Makefile
+applets/invest-applet/data/art/Makefile
+applets/invest-applet/data/Makefile
+applets/invest-applet/help/Makefile
+applets/invest-applet/invest/defs.py
+applets/invest-applet/invest/Makefile
+applets/invest-applet/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
 doc/Makefile
@@ -742,6 +759,7 @@ echo "
              - drivemount              always
              - geyes                   always
              - gweather                $build_libgweather_applets
+             - invest-applet           $HAVE_PYGOBJECT
 
             Using DBUS:                $HAVE_DBUS
             Using NetworkManager:      $HAVE_NETWORKMANAGER
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 5e5566c..f17d543 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -10,10 +10,6 @@ if APPLET_MODEMLIGHTS
 modemlights_SUBDIRS = $(modemlights_applets)
 endif
 
-if BUILD_INVEST_APPLET
-invest_applet_SUBDIR = invest-applet
-endif
-
 if BUILD_MIXER_APPLET
 mixer_applet_SUBDIR = mixer
 endif
@@ -31,7 +27,6 @@ SUBDIRS = \
        $(gtop_SUBDIRS)         \
        $(libgweather_SUBDIRS)  \
        $(vfs_SUBDIRS)          \
-       $(invest_applet_SUBDIR) \
        $(cpufreq_SUBDIR) \
        $(mixer_applet_SUBDIR)
 
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index 2d1eb1c..b325a20 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -35,8 +35,6 @@ AC_ISC_POSIX
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 AC_PATH_XTRA
-AM_PATH_PYTHON(2.4)
-AM_CHECK_PYTHON_HEADERS(HAVE_PYHDRS="yes", HAVE_PYHDRS="no")
 
 X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 AC_SUBST(X_LIBS)
@@ -144,9 +142,6 @@ PKG_CHECK_MODULES(LIBWNCK, libwnck-3.0 >= $LIBWNCK_REQUIRED,,
 AC_SUBST(LIBWNCK_CFLAGS)
 AC_SUBST(LIBWNCK_LIBS)
 
-dnl -- check for Python/GNOME modules (optional) ------------------------------
-PKG_CHECK_MODULES(PYGOBJECT, pygobject-3.0, HAVE_PYGOBJECT="yes", HAVE_PYGOBJECT="no")
-
 dnl -- check for libxml2 (required) ------------------------------------------
 PKG_CHECK_MODULES(XML2, libxml-2.0 >= $LIBXML_REQUIRED)
 AC_SUBST(XML2_CFLAGS)
@@ -286,12 +281,6 @@ dnl fi
 AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
 
 dnl ***************************************************************************
-dnl *** invest-applet specific checks                                       ***
-dnl ***************************************************************************
-
-AM_CONDITIONAL(BUILD_INVEST_APPLET, test "x$HAVE_PYGOBJECT" = "xyes")
-
-dnl ***************************************************************************
 dnl *** Check for getaddrinfo                                               ***
 dnl ***************************************************************************
 have_getaddrinfo=no
@@ -346,12 +335,6 @@ AC_OUTPUT([
 gnome-applets.spec
 Makefile
 po/Makefile.in
-invest-applet/data/art/Makefile
-invest-applet/data/Makefile
-invest-applet/help/Makefile
-invest-applet/invest/defs.py
-invest-applet/invest/Makefile
-invest-applet/Makefile
 man/Makefile
 mini-commander/help/Makefile
 mini-commander/Makefile
@@ -381,7 +364,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - invest-applet                $BUILD_INVEST_APPLET
         - mini-commander               $enable_mini_commander
         - modemlights                  $BUILD_MODEM_LIGHTS
         - mixer                        $enable_mixer