applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

patch from Brian Cameron

Browse source 
2002-07-10  Jody Goldberg <jody@gnome.org>
	patch from Brian Cameron

	* configure.in : look for path to esound
This commit is contained in:
Jody Goldberg 2002-07-10 14:42:06 +00:00 • committed by Jody Goldberg
parent 06b5ffb421
commit 3bf58de536
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2002-07-10 Jody Goldberg <jody@gnome.org>
patch from Brian Cameron
* configure.in : look for path to esound
2002-06-25 James Henstridge <james@daa.com.au>
* gnome-settings-daemon/Makefile.am: commented lines ending in a

10
configure.in
View file

@ -81,6 +81,16 @@ AC_SUBST(LIBBONOBO_IDL_DIR)
BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
# esd
ESDSERVERDIR=`$PKG_CONFIG --variable=esd_serverdir esound`
if test x"$ESDSERVERDIR" = x; then
ESD_SERVER="esd"
else
ESD_SERVER="$ESDSERVERDIR/esd"
fi
AC_SUBST(ESD_SERVER)
dnl ==============================================
dnl Special GConf section
dnl ==============================================

4
gnome-settings-daemon/Makefile.am
View file

@ -1,4 +1,6 @@
INCLUDES=$(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
INCLUDES=$(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DESD_SERVER="\"$(ESD_SERVER)\""
bin_PROGRAMS=gnome-settings-daemon

2
gnome-settings-daemon/gnome-settings-sound.c
View file

@ -50,7 +50,7 @@ static void
start_esd (void)
{
int esdpid;
static const char *esd_cmdline[] = {"esd", "-nobeeps", NULL};
static const char *esd_cmdline[] = {ESD_SERVER, "-nobeeps", NULL};
char *tmpargv[3];
char argbuf[32];
time_t starttime;