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

[jensg svn gnome org]

Author: jensg
Date: Sat Jun 14 09:25:57 2008
New Revision: 374
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=374&view=rev

Log:
2008-06-14  Jens Granseuer  <jensgr gmx net>

	Based on a patch by: Brian Cameron <brian cameron sun com>

	* configure.ac:
	* plugins/sound/Makefile.am:
	* plugins/sound/gsd-sound-manager.c: (start_gnome_sound): if
	available use the esd_serverdir variable to locate the esd daemon
	so it can be started even if it's not in the PATH (bug #531868)


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/sound/Makefile.am
   trunk/plugins/sound/gsd-sound-manager.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jun 14 09:25:57 2008
@@ -222,10 +222,18 @@
        PKG_CHECK_MODULES(ESD, esound >= 0.2.28,
 	       AC_DEFINE(HAVE_ESD, 1, [Define if ESD sound server should be used]),
                AC_MSG_RESULT([disabled]))
+
+       GSD_ESD_LOCATION=`pkg-config esound --variable=esd_serverdir`
+       if test "x$GSD_ESD_LOCATION" != "x"; then
+           # Add slash so that if the ESD pkgconfig file does not
+           # specify esd_serverdir, g-s-d will look in the PATH
+           GSD_ESD_LOCATION="$GSD_ESD_LOCATION/"
+       fi
 fi
 
 AC_SUBST(ESD_CFLAGS)
 AC_SUBST(ESD_LIBS)
+AC_SUBST(ESD_LOCATION)
 
 dnl ==============================================
 dnl GStreamer section

Modified: trunk/plugins/sound/Makefile.am
==============================================================================
--- trunk/plugins/sound/Makefile.am	(original)
+++ trunk/plugins/sound/Makefile.am	Sat Jun 14 09:25:57 2008
@@ -16,6 +16,7 @@
 	$(AM_CPPFLAGS)
 
 libsound_la_CFLAGS = \
+	-DESD_LOCATION=\"$(ESD_LOCATION)\" \
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(GNOME_CFLAGS)			\
 	$(ESD_CFLAGS)			\

Modified: trunk/plugins/sound/gsd-sound-manager.c
==============================================================================
--- trunk/plugins/sound/gsd-sound-manager.c	(original)
+++ trunk/plugins/sound/gsd-sound-manager.c	Sat Jun 14 09:25:57 2008
@@ -97,7 +97,7 @@
 static gboolean
 start_gnome_sound (GsdSoundManager *manager)
 {
-        char    *argv[] = { "esd", "-nobeeps", NULL};
+        char    *argv[] = { ESD_LOCATION  "esd", "-nobeeps", NULL};
         GError  *error;
         gboolean res;
         time_t   starttime;