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

don't fail if gstreamer is not available, but simply skip the sound

Browse source 
2007-07-15  Jens Granseuer  <jensgr@gmx.net>

	* capplets/Makefile.am:
	* configure.in: don't fail if gstreamer is not available, but simply
	skip the sound capplet (closes bug #456957)

svn path=/trunk/; revision=7859
This commit is contained in:
Jens Granseuer 2007-07-15 18:07:51 +00:00 • committed by Jens Granseuer
parent 079b4de8bf
commit b75a357795
3 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-07-15 Jens Granseuer <jensgr@gmx.net>
* capplets/Makefile.am:
* configure.in: don't fail if gstreamer is not available, but simply
skip the sound capplet (closes bug #456957)
2007-07-09 Rodrigo Moya <rodrigo@gnome-db.org> 2007-07-09 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in: * configure.in:

9
capplets/Makefile.am
View file

@ -3,10 +3,9 @@ always_built_SUBDIRS = \
accessibility \ accessibility \
appearance \ appearance \
default-applications \ default-applications \
keybindings \
keyboard \ keyboard \
mouse \ mouse \
sound \
keybindings \
network \ network \
windows windows
@ -20,5 +19,9 @@ if BUILD_ABOUTME
SUBDIRS += about-me SUBDIRS += about-me
endif endif
if HAVE_GSTREAMER
SUBDIRS += sound
endif
DIST_SUBDIRS = \ DIST_SUBDIRS = \
$(always_built_SUBDIRS) display about-me $(always_built_SUBDIRS) display about-me sound

15
configure.in
View file

@ -108,9 +108,6 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0) PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0)
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0) 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(SOUND_CAPPLET, esound gstreamer-0.10 gstreamer-plugins-base-0.10)
SOUND_CAPPLET_LIBS="$SOUND_CAPPLET_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
AC_SUBST(SOUND_CAPPLET_LIBS)
PKG_CHECK_MODULES(METACITY, libmetacity-private) PKG_CHECK_MODULES(METACITY, libmetacity-private)
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.13 gconf-2.0 gtk+-2.0) PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.13 gconf-2.0 gtk+-2.0)
@ -165,8 +162,6 @@ CAPPLET_LIBS="$CAPPLET_LIBS $x_libs"
GNOMECC_LIBS="$GNOMECC_LIBS $x_libs" GNOMECC_LIBS="$GNOMECC_LIBS $x_libs"
GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS $x_libs" GNOME_SETTINGS_DAEMON_LIBS="$GNOME_SETTINGS_DAEMON_LIBS $x_libs"
AC_PATH_PROG(GCONFTOOL, gconftool-2)
dnl dnl
dnl Check for XCursor support. If it exists, then we compile the dnl Check for XCursor support. If it exists, then we compile the
dnl mouse capplet with support for it turned on dnl mouse capplet with support for it turned on
@ -432,10 +427,18 @@ if test "x$ENABLE_GSTREAMER" = "xyes"; then
else else
AC_MSG_NOTICE([*** GStreamer support disabled ***]) AC_MSG_NOTICE([*** GStreamer support disabled ***])
fi fi
AM_CONDITIONAL(HAVE_GSTREAMER, test x"$have_gstreamer" = "xyes") AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)
if test "x$have_gstreamer" = "xyes"; then
PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
SOUND_CAPPLET_LIBS="$GST_LIBS -lgstaudio-0.10 -lgstinterfaces-0.10"
AC_SUBST(SOUND_CAPPLET_LIBS)
else
AC_MSG_NOTICE([*** Sound capplet will not be built]);
fi
dnl ============================================== dnl ==============================================
dnl Define the main variables dnl Define the main variables
dnl ============================================== dnl ==============================================