From 24334bcbaff3aadf9fb293d31860b8ea49647c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrg=20Billeter?= Date: Fri, 5 May 2006 13:23:30 +0000 Subject: [PATCH] Add gstreamer-0.10 and optionally HAL to sound capplet dependencies. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2006-05-05 Jürg Billeter * configure.in: Add gstreamer-0.10 and optionally HAL to sound capplet dependencies. --- ChangeLog | 5 +++++ configure.in | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ee8ae82d6..2550055a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-05 Jürg Billeter + + * configure.in: Add gstreamer-0.10 and optionally HAL to sound + capplet dependencies. + 2006-04-27 Bastien Nocera * configure.in: remove checks for fb-level support diff --git a/configure.in b/configure.in index 549413109..3e94a25d0 100644 --- a/configure.in +++ b/configure.in @@ -106,7 +106,7 @@ PKG_CHECK_MODULES(GTK, gtk+-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(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) -PKG_CHECK_MODULES(SOUND_CAPPLET, esound) +PKG_CHECK_MODULES(SOUND_CAPPLET, esound gstreamer-0.10) PKG_CHECK_MODULES(METACITY, libmetacity-private) PKG_CHECK_MODULES(LIBXKLAVIER, libxklavier >= 2.91,, AC_MSG_ERROR([gnome-control-center depends on libxklavier. @@ -353,6 +353,17 @@ fi AM_CONDITIONAL(BUILD_ABOUTME, test -n "$LIBEBOOK_REQUIREMENT") AM_CONDITIONAL(HAVE_LIBEBOOK, test -n "$LIBEBOOK_REQUIREMENT") +dnl ============================================== +dnl HAL stuff +dnl ============================================== +AC_ARG_ENABLE(hal, AC_HELP_STRING([--disable-hal],[build without hal support])) +if test "x$enable_hal" != "xno"; then + PKG_CHECK_MODULES(HAL, [hal >= 0.5.6, dbus-1 >= 0.32, dbus-glib-1 >= 0.32], + [ AC_DEFINE(USE_HAL, 1, [defined if using libhal]) ],) + AC_SUBST(HAL_CFLAGS) + AC_SUBST(HAL_LIBS) +fi + dnl ============================================== dnl End: Check that we meet the dependencies dnl ==============================================