gnome-control-center r8824 - in trunk: . capplets

[jensg svn gnome org]

Author: jensg
Date: Tue Jul 29 18:30:28 2008
New Revision: 8824
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8824&view=rev

Log:
2008-07-29  Jens Granseuer  <jensgr gmx net>

	* capplets/Makefile.am:
	* configure.in: fix build without libcanberra


Modified:
   trunk/ChangeLog
   trunk/capplets/Makefile.am
   trunk/configure.in

Modified: trunk/capplets/Makefile.am
==============================================================================
--- trunk/capplets/Makefile.am	(original)
+++ trunk/capplets/Makefile.am	Tue Jul 29 18:30:28 2008
@@ -19,7 +19,7 @@
 SUBDIRS += about-me
 endif
 
-if HAVE_GSTREAMER
+if BUILD_SOUND
 SUBDIRS += sound
 endif
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 29 18:30:28 2008
@@ -107,7 +107,6 @@
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
-PKG_CHECK_MODULES(LIBSOUNDS, gio-2.0 libgnome-2.0 libgnomeui-2.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
 
@@ -293,6 +292,7 @@
 else
   AC_MSG_NOTICE([*** Sound capplet will not be built]);
 fi
+AM_CONDITIONAL(BUILD_SOUND, test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes")
 
 dnl ==============================================
 dnl Define the main variables