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

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

commit 8b2bfd7c9fcad817a9381719a0501f50a3f71133
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed May 28 00:42:07 2014 +0300

    Fix mixer applet build

 applets/Makefile.am        |    4 ++++
 applets/mixer/Makefile.am  |    8 ++++++--
 applets/mixer/applet.h     |    1 +
 configure.ac               |   24 ++++++++++++++++++++++++
 gnome-applets/Makefile.am  |    8 --------
 gnome-applets/configure.ac |   24 ------------------------
 6 files changed, 35 insertions(+), 34 deletions(-)
---
diff --git a/applets/Makefile.am b/applets/Makefile.am
index 977eccf..43d2ee6 100644
--- a/applets/Makefile.am
+++ b/applets/Makefile.am
@@ -32,4 +32,8 @@ if APPLET_MODEMLIGHTS
 SUBDIRS += modemlights
 endif
 
+if BUILD_MIXER_APPLET
+SUBDIRS += mixer
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/applets/mixer/Makefile.am b/applets/mixer/Makefile.am
index bc31b16..26443aa 100644
--- a/applets/mixer/Makefile.am
+++ b/applets/mixer/Makefile.am
@@ -1,9 +1,12 @@
 SUBDIRS = help
 
 AM_CPPFLAGS = -I. -I$(srcdir)                  \
+       -I$(srcdir)/../../libpanel-applet \
+       -I$(top_builddir)/libpanel-applet \
+       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        -DMIXER_MENU_UI_DIR=\""$(uidir)"\"      \
        $(MIXER_CFLAGS)                         \
-       $(GNOME_APPLETS_CFLAGS)                 \
+       $(LIBPANEL_APPLET_CFLAGS)                       \
        $(WARN_CFLAGS)
 
 libexec_PROGRAMS = mixer_applet2
@@ -22,7 +25,8 @@ noinst_HEADERS = \
 
 mixer_applet2_LDADD =                                  \
        $(MIXER_LIBS)                                   \
-       $(GNOME_APPLETS_LIBS)
+       ../../libpanel-applet/libpanel-applet-4.la \
+       $(LIBPANEL_APPLET_LIBS)
 
 appletdir       = $(datadir)/gnome-panel/4.0/applets
 applet_in_files = org.gnome.applets.MixerApplet.panel-applet.in
diff --git a/applets/mixer/applet.h b/applets/mixer/applet.h
index cbff8c8..dac2844 100644
--- a/applets/mixer/applet.h
+++ b/applets/mixer/applet.h
@@ -95,6 +95,7 @@ typedef struct _GnomeVolumeAppletClass {
   PanelAppletClass klass;
 } GnomeVolumeAppletClass;
 
+GList   *gnome_volume_applet_create_mixer_collection (void);
 void     gnome_volume_applet_adjust_volume (GstMixer      *mixer,
                                            GstMixerTrack *track,
                                            gdouble        volume);
diff --git a/configure.ac b/configure.ac
index 3bc47a7..278956c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,7 @@ UPOWER_REQUIRED=0.9.4
 POLKIT_REQUIRED=0.92
 NETWORKMANAGER_REQUIRED=0.7
 LIBNOTIFY_REQUIRED=0.7
+GST10_REQUIRED=0.10.2
 
 dnl pkg-config dependency checks
 
@@ -464,6 +465,26 @@ fi
 AC_SUBST(GUCHARMAP_CFLAGS)
 AC_SUBST(GUCHARMAP_LIBS)
 
+dnl -- check for the Mixer ----------------------------------------------------
+AC_ARG_ENABLE([mixer-applet],
+    AC_HELP_STRING([--enable-mixer-applet], [Enable the gstreamer-based mixer applet.]),
+    enable_mixer=$enableval,
+    enable_mixer=no)
+MIXER_CFLAGS=
+MIXER_LIBS=
+if test "x$enable_mixer" != "xno"; then
+    GST10_PKGS="gstreamer-0.10 >= $GST10_REQUIRED gstreamer-interfaces-0.10 >= $GST10_REQUIRED 
gstreamer-audio-0.10 >= $GST10_REQUIRED"
+    PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST=yes, HAVE_GST=no)
+    if test "x$HAVE_GST" = "xno"; then
+        enable_mixer=no
+        AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found])
+    fi
+fi
+MIXER_LIBS="$MIXER_LIBS -lm"
+AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes")
+AC_SUBST(MIXER_CFLAGS)
+AC_SUBST(MIXER_LIBS)
+
 dnl ***************************************************************************
 dnl *** Check if IPv6 is available                                          ***
 dnl ***************************************************************************
@@ -741,6 +762,8 @@ applets/invest-applet/Makefile
 applets/mini-commander/help/Makefile
 applets/mini-commander/Makefile
 applets/mini-commander/src/Makefile
+applets/mixer/help/Makefile
+applets/mixer/Makefile
 applets/modemlights/Makefile
 applets/notification_area/Makefile
 applets/wncklet/Makefile
@@ -810,6 +833,7 @@ echo "
              - gweather                $build_libgweather_applets
              - invest-applet           $HAVE_PYGOBJECT
              - mini-commander          $enable_mini_commander
+             - mixer                   $enable_mixer
              - modemlights             $BUILD_MODEM_LIGHTS
 
             Using DBUS:                $HAVE_DBUS
diff --git a/gnome-applets/Makefile.am b/gnome-applets/Makefile.am
index 3689d81..e20ac59 100644
--- a/gnome-applets/Makefile.am
+++ b/gnome-applets/Makefile.am
@@ -4,10 +4,6 @@ if BUILD_GTOP_APPLETS
 gtop_SUBDIRS = $(gtop_applets)
 endif
 
-if BUILD_MIXER_APPLET
-mixer_applet_SUBDIR = mixer
-endif
-
 always_built_SUBDIRS =  \
        stickynotes     \
        trashapplet     \
@@ -17,10 +13,6 @@ SUBDIRS = \
        po                      \
        $(always_built_SUBDIRS) \
        $(gtop_SUBDIRS)         \
-       $(libgweather_SUBDIRS)  \
-       $(vfs_SUBDIRS)          \
-       $(cpufreq_SUBDIR) \
-       $(mixer_applet_SUBDIR)
 
 DIST_SUBDIRS = \
        po              \
diff --git a/gnome-applets/configure.ac b/gnome-applets/configure.ac
index 2c9a525..6cee136 100644
--- a/gnome-applets/configure.ac
+++ b/gnome-applets/configure.ac
@@ -21,7 +21,6 @@ LIBXKLAVIER_REQUIRED=4.0
 LIBWNCK_REQUIRED=2.91.0
 GNOME_ICON_THEME_REQUIRED=2.15.91
 LIBXML_REQUIRED=2.5.0
-GST10_REQUIRED=0.10.2
 dnl ***************************************************************************
 
 AM_MAINTAINER_MODE
@@ -135,26 +134,6 @@ PKG_CHECK_MODULES(XML2, libxml-2.0 >= $LIBXML_REQUIRED)
 AC_SUBST(XML2_CFLAGS)
 AC_SUBST(XML2_LIBS)
 
-dnl -- check for the Mixer ----------------------------------------------------
-AC_ARG_ENABLE([mixer-applet],
-    AC_HELP_STRING([--enable-mixer-applet], [Enable the gstreamer-based mixer applet.]),
-    enable_mixer=$enableval,
-    enable_mixer=no)
-MIXER_CFLAGS=
-MIXER_LIBS=
-if test "x$enable_mixer" != "xno"; then
-    GST10_PKGS="gstreamer-0.10 >= $GST10_REQUIRED gstreamer-interfaces-0.10 >= $GST10_REQUIRED 
gstreamer-audio-0.10 >= $GST10_REQUIRED"
-    PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST=yes, HAVE_GST=no)
-    if test "x$HAVE_GST" = "xno"; then
-        enable_mixer=no
-        AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found])
-    fi
-fi
-MIXER_LIBS="$MIXER_LIBS -lm"
-AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes")
-AC_SUBST(MIXER_CFLAGS)
-AC_SUBST(MIXER_LIBS)
-
 dnl ***************************************************************************
 dnl *** find paths to installed binaries                                    ***
 dnl ***************************************************************************
@@ -281,8 +260,6 @@ gnome-applets.spec
 Makefile
 po/Makefile.in
 man/Makefile
-mixer/help/Makefile
-mixer/Makefile
 multiload/help/Makefile
 multiload/Makefile
 null_applet/Makefile
@@ -305,7 +282,6 @@ gnome-applets-$VERSION configure summary:
        Source code location:           ${srcdir}
        Compiler:                       ${CC}
 
-        - mixer                        $enable_mixer
         - multiload                    $build_gtop_applets
         - stickynotes                  $enable_stickynotes
         - trashapplet                  always