gnome-control-center build patch



the control-center doesn't build on my system (slackware 8.0) without
this patch.  all it does is add the esd cflags and libs to the sound
capplet.  could someone please commit?  thanks!

todd


? default_applications.patch
? sound_capplet.patch
? capplets/desktop-links/Advanced.directory
? capplets/desktop-links/Advanced.directory.in
? capplets/desktop-links/Sawfish/Makefile.in
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/configure.in,v
retrieving revision 1.300
diff -u -r1.300 configure.in
--- configure.in	2002/02/12 05:07:44	1.300
+++ configure.in	2002/02/12 18:34:27
@@ -50,6 +50,7 @@
 PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)
 PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
 PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0)
+PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
 
 if test "$XSCREENSAVER" = no ; then
  	AC_MSG_ERROR(xscreensaver was not found. It can be downloaded from http://www.jwz.org/xscreensaver/.)
@@ -98,10 +99,12 @@
 AC_SUBST(VFS_CAPPLET_CFLAGS)
 AC_SUBST(VFS_CAPPLET_LIBS)
 
+AC_SUBST(SOUND_CAPPLET_CFLAGS)
+AC_SUBST(SOUND_CAPPLET_LIBS)
+
 dnl ==============================================
 dnl End: Define the main variables
 dnl ==============================================
-
 
 GCONF_CONFIG_SOURCE=
 AC_ARG_ENABLE(gconf-source, [  --enable-gconf-source=sourceaddress      Where to install schema files.],GCONF_CONFIG_SOURCE=$enable_gconf_source,)
Index: capplets/sound/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/sound/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- capplets/sound/Makefile.am	2002/01/19 15:18:33	1.30
+++ capplets/sound/Makefile.am	2002/02/12 18:34:37
@@ -1,6 +1,6 @@
 bin_PROGRAMS = gnome2-sound-properties
 
-gnome2_sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(top_builddir)/libsounds/libsounds.a
+gnome2_sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(SOUND_CAPPLET_LIBS) $(top_builddir)/libsounds/libsounds.a
 gnome2_sound_properties_SOURCES = sound-properties-capplet.c
 
 @INTLTOOL_DESKTOP_RULE@
@@ -18,7 +18,7 @@
 Desktop_in_files = sound.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]