diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-06-07 11:16:21 -0700 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-06-23 09:34:20 -0700 |
| commit | 627643e93b4b38a1904684f9361b498d0fe7ec3a (patch) | |
| tree | fe874554e409f4568199acaf8602cc55bfe997a7 | |
| parent | 2d042c289bcc140f402c20603c12e57339815cf4 (diff) | |
Don't build dbus-glib into Telepathy backend.
Helps: bgo#629716 - Migrate Folks to GDBus
| -rw-r--r-- | backends/telepathy/lib/Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index 675e2c6..167fba3 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -111,7 +111,6 @@ libfolks_telepathy_la_VALAFLAGS = \ --pkg gobject-2.0 \ --pkg gio-2.0 \ --pkg gee-1.0 \ - --pkg dbus-glib-1 \ --pkg telepathy-glib \ --includedir folks \ --vapi folks-telepathy.vapi \ @@ -121,7 +120,6 @@ libfolks_telepathy_la_VALAFLAGS = \ libfolks_telepathy_la_CFLAGS = \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(TP_GLIB_CFLAGS) \ $(NULL) @@ -129,7 +127,6 @@ libfolks_telepathy_la_CFLAGS = \ libfolks_telepathy_la_LIBADD = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(GEE_LIBS) \ $(TP_GLIB_LIBS) \ $(top_builddir)/folks/libfolks.la \ diff --git a/configure.ac b/configure.ac index 5447cc3..432f30d 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,6 @@ if test "x$enable_libsocialweb_backend" != "xno"; then if test "x$have_libsocialweb_backend" = "xyes" -a \ "x$enable_vala" = "xyes"; then VALA_CHECK_PACKAGES([telepathy-glib - dbus-glib-1 gio-2.0 gee-1.0 libsocialweb-client], @@ -131,7 +130,6 @@ PKG_CHECK_MODULES([GLIB], gobject-2.0 >= $GLIB_REQUIRED]) PKG_CHECK_MODULES([GMODULE], [gmodule-no-export-2.0]) PKG_CHECK_MODULES([GIO], [gio-2.0 >= $GLIB_REQUIRED]) -PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1]) PKG_CHECK_MODULES([GCONF2], [gconf-2.0 >= $GCONF2_REQUIRED]) # FIXME: We depend on libgee < 0.7 because 0.7 breaks API. bgo#627746 @@ -212,7 +210,6 @@ if test "x$enable_vala" = "xyes" ; then AC_SUBST([VAPIDIR]) VALA_CHECK_PACKAGES([telepathy-glib - dbus-glib-1 gio-2.0 gee-1.0]) |