[totem] build: Remove some dead dbus-glib checks
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] build: Remove some dead dbus-glib checks
- Date: Mon, 4 Apr 2011 16:39:46 +0000 (UTC)
commit 4030a5a41167a43af518bf926ac2936316c797e3
Author: Bastien Nocera <hadess hadess net>
Date: Tue Mar 29 21:46:05 2011 +0100
build: Remove some dead dbus-glib checks
https://bugzilla.gnome.org/show_bug.cgi?id=646163
configure.in | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/configure.in b/configure.in
index ca56905..90f86f7 100644
--- a/configure.in
+++ b/configure.in
@@ -400,10 +400,10 @@ for plugin in ${used_plugins}; do
fi
;;
media-player-keys)
- PKG_CHECK_MODULES(MEDIA_PLAYER_KEYS, dbus-glib-1,
+ PKG_CHECK_MODULES(MEDIA_PLAYER_KEYS, gio-2.0 >= 2.24,
[HAVE_MEDIA_PLAYER_KEYS=yes], [HAVE_MEDIA_PLAYER_KEYS=no])
if test "${HAVE_MEDIA_PLAYER_KEYS}" != "yes" ; then
- plugin_error_or_ignore "you need dbus-glib-1 installed for the media-player-keys plugin"
+ plugin_error_or_ignore "you need gio >= 2.24 installed for the media-player-keys plugin"
add_plugin="0"
fi
;;
@@ -678,25 +678,6 @@ if test x$HAVE_NAUTILUS = "xyes"; then
fi
AM_CONDITIONAL(HAVE_NAUTILUS, test x$HAVE_NAUTILUS = "xyes")
-dnl ***************************
-dnl D-Bus for gnome-screensaver
-dnl ***************************
-AC_ARG_WITH(dbus,
- AC_HELP_STRING([--with-dbus],
- [Enable D-BUS support]),,
- with_dbus=auto)
-if test "x$with_dbus" != "xno"; then
- PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQS, enable_dbus=yes, enable_dbus=no)
- if test "x$with_dbus" = xyes && test "x$enable_dbus" = xno; then
- AC_MSG_ERROR([D-BUS explicitly requested but no support found])
- fi
- if test "x$enable_dbus" = xyes; then
- AC_DEFINE(WITH_DBUS, 1, [Define if D-BUS is enabled])
- AC_DEFINE(ENABLE_DBUS, 1, [Define if D-BUS is enabled])
- fi
-fi
-AM_CONDITIONAL(WITH_DBUS, test "x$enable_dbus" = "xyes")
-
GLIB_GSETTINGS
GNOME_COMMON_INIT
@@ -878,11 +859,6 @@ if test x$enable_xtest = xyes ; then
else
AC_MSG_NOTICE([ XTest (legacy screensaver) support disabled])
fi
-if test x$enable_dbus = xyes ; then
- AC_MSG_NOTICE([** D-Bus (gnome-screensaver) support enabled])
-else
- AC_MSG_NOTICE([ D-Bus (gnome-screensaver) support disabled])
-fi
if test x$have_xfree = xyes ; then
AC_MSG_NOTICE([** XFree86 multimedia keys support enabled])
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]