[Telepathy-commits] [telepathy-salut/master] bump dbus dependency to 1.1.0 so we can remove the dbus_message_marshal specific test

[Guillaume Desmottes]

---
 configure.ac |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index d6ae120..43f8fc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,29 +145,11 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
 dnl Check for D-Bus
-PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0, dbus-glib-1 >= 0.61])
+PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.1.0, dbus-glib-1 >= 0.61])
 
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-dnl Check for D-Bus tubes
-AC_CHECK_LIB(dbus-1, dbus_message_marshal,
-             [have_dbus_message_marshal=yes],
-             [have_dbus_message_marshal=no],
-             [$DBUS_LIBS])
-
-have_dbus_tube=no
-if test x$have_dbus_message_marshal = xyes; then
-  have_dbus_tube=yes
-  AC_DEFINE(ENABLE_DBUS_TUBES, 1, [Define if we have D-Bus tubes support])
-fi
-
-AM_CONDITIONAL(ENABLE_DBUS_TUBES, test x$have_dbus_tube = xyes)
-
-if test x$have_dbus_tube = xno; then
-  AC_MSG_WARN("Not building support for D-Bus tubes! (libdbus >= 1.1 required)")
-fi
-
 dnl Check for libxml2
 PKG_CHECK_MODULES(LIBXML2, [libxml-2.0])
 
-- 
1.5.6.5