gnome-settings-daemon r161 - in trunk: . plugins/sound

[jensg svn gnome org]

Author: jensg
Date: Tue Feb 19 19:24:18 2008
New Revision: 161
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=161&view=rev

Log:
2008-02-19  Jens Granseuer  <jensgr gmx net>

	* configure.ac: remove some unused stuff
	* plugins/sound/Makefile.am: add missing ESD_CFLAGS/LIBS


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/sound/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb 19 19:24:18 2008
@@ -253,7 +253,7 @@
 dnl ==============================================
 dnl Esd section
 dnl ==============================================
-have_esd=no
+
 AC_ARG_ENABLE(esd,
   AC_HELP_STRING([--disable-esd],
                  [turn off ESD audio support]),
@@ -266,12 +266,10 @@
 
 if test x$WANT_ESD = xyes ; then
        PKG_CHECK_MODULES(ESD, esound >= 0.2.28,
-               have_esd=yes
 	       AC_DEFINE(HAVE_ESD, 1, [Define if ESD sound server should be used]),
                AC_MSG_RESULT([disabled]))
 fi
 
-AM_CONDITIONAL(HAVE_ESD, test x"$have_esd" = "xyes")
 AC_SUBST(ESD_CFLAGS)
 AC_SUBST(ESD_LIBS)
 
@@ -310,16 +308,6 @@
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
 
-if test "x$have_gstreamer" = "xyes"; then
-  PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
-  SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS $GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
-  SOUND_CAPPLET_CFLAGS="$SOUND_CAPPLET_CFLAGS $GST_CFLAGS"
-  AC_SUBST(SOUND_CAPPLET_LIBS)
-  AC_SUBST(SOUND_CAPPLET_CFLAGS)
-else
-  AC_MSG_NOTICE([*** Sound capplet will not be built]);
-fi
-
 # ---------------------------------------------------------------------------
 # Plugins
 # ---------------------------------------------------------------------------

Modified: trunk/plugins/sound/Makefile.am
==============================================================================
--- trunk/plugins/sound/Makefile.am	(original)
+++ trunk/plugins/sound/Makefile.am	Tue Feb 19 19:24:18 2008
@@ -18,14 +18,16 @@
 libsound_la_CFLAGS = \
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(GNOME_CFLAGS)			\
+	$(ESD_CFLAGS)			\
 	$(AM_CFLAGS)
 
 libsound_la_LDFLAGS = 		\
 	$(GSD_PLUGIN_LDFLAGS)
 
-libsound_la_LIBADD  = 		\
+libsound_la_LIBADD  = \
 	$(top_builddir)/plugins/sound/libsounds/libsounds.la	\
-	$(SETTINGS_PLUGIN_LIBS)
+	$(SETTINGS_PLUGIN_LIBS)					\
+	$(ESD_LIBS)
 
 plugin_in_files = 		\
 	sound.gnome-settings-plugin.in