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

Patch by: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>

Browse source 
2008-09-15  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>

	* configure.in: add --without-libcanberra to skip building the sound
	capplet (bug #551765)

svn path=/trunk/; revision=8958
This commit is contained in:
Jens Granseuer 2008-09-15 17:04:31 +00:00 • committed by Jens Granseuer
parent 6501a81b06
commit 56b74bb4c6
2 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-09-15 Jens Granseuer <jensgr@gmx.net>
Patch by: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
* configure.in: add --without-libcanberra to skip building the sound
capplet (bug #551765)
2008-09-05 Rodrigo Moya <rodrigo@gnome-db.org>
Patch by Nirbheek Chauhan

25
configure.in
View file

@ -281,17 +281,28 @@ dnl ==============================================
dnl sound capplet section
dnl ==============================================
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= 0.4 gio-2.0, have_canberra=yes, have_canberra=no)
AC_ARG_WITH(libcanberra,
AC_HELP_STRING([--without-libcanberra],[Don't build parts depending on libcanberra]),
with_libcanberra=$withval,
with_libcanberra=yes)
if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
SOUND_CAPPLET_CFLAGS="$GST_CFLAGS"
AC_SUBST(SOUND_CAPPLET_LIBS)
AC_SUBST(SOUND_CAPPLET_CFLAGS)
if test "x$with_libcanberra" != "xno"; then
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= 0.4 gio-2.0, have_canberra=yes, have_canberra=no)
if test "x$have_gstreamer" = "xyes" && test "x$have_canberra" = "xyes" ; then
SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
SOUND_CAPPLET_CFLAGS="$GST_CFLAGS"
AC_SUBST(SOUND_CAPPLET_LIBS)
AC_SUBST(SOUND_CAPPLET_CFLAGS)
else
if test "x$with_libcanberra" = "xyes" -a "x$have_canberra" = "xno"; then
AC_MSG_ERROR([Sound capplet requested but libcanberra not found])
fi
AC_MSG_NOTICE([*** Sound capplet will not be built]);
fi
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")
AM_CONDITIONAL(BUILD_SOUND, test "x$with_libcanberra" = "xyes")
dnl ==============================================
dnl Define the main variables