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

fix build without libcanberra

Browse source 
2008-07-29  Jens Granseuer  <jensgr@gmx.net>

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

svn path=/trunk/; revision=8824
This commit is contained in:
Jens Granseuer 2008-07-29 18:30:28 +00:00 • committed by Jens Granseuer
parent ebc660f223
commit 15dc0f2a79
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-07-29 Jens Granseuer <jensgr@gmx.net>
* capplets/Makefile.am:
* configure.in: fix build without libcanberra
2008-07-29 Bastien Nocera <hadess@hadess.net> 2008-07-29 Bastien Nocera <hadess@hadess.net>
* configure.in: Make sure we require libcanberra 0.4 * configure.in: Make sure we require libcanberra 0.4

2
capplets/Makefile.am
View file

@ -19,7 +19,7 @@ if BUILD_ABOUTME
SUBDIRS += about-me SUBDIRS += about-me
endif endif
if HAVE_GSTREAMER if BUILD_SOUND
SUBDIRS += sound SUBDIRS += sound
endif endif

2
configure.in
View file

@ -107,7 +107,6 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1) 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(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(GSD_DBUS, gnome-settings-daemon)
PKG_CHECK_MODULES(GIO, gio-2.0) PKG_CHECK_MODULES(GIO, gio-2.0)
@ -293,6 +292,7 @@ if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
else else
AC_MSG_NOTICE([*** Sound capplet will not be built]); AC_MSG_NOTICE([*** Sound capplet will not be built]);
fi fi
AM_CONDITIONAL(BUILD_SOUND, test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes")
dnl ============================================== dnl ==============================================
dnl Define the main variables dnl Define the main variables