[Telepathy-commits] [telepathy-haze/master] Explicitly use dbus-glib CFLAGS and LIBS.

[Will Thompson]

Previously, we relied on telepathy-glib happening to pull them in, but
since functions and types from dbus-glib are used directly this is more
correct.
---
 configure.ac    |    9 +++++++++
 src/Makefile.am |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 93e3fb6..e2e7b4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,15 @@ PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.7.17])
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
 
+PKG_CHECK_MODULES(DBUS_GLIB,[dbus-glib-1 >= 0.73])
+AC_SUBST(DBUS_GLIB_CFLAGS)
+AC_SUBST(DBUS_GLIB_LIBS)
+
+AC_CHECK_LIB(telepathy-glib, tp_debug_divert_messages,
+  [ AC_DEFINE(HAVE_TP_DEBUG_DIVERT_MESSAGES, [],
+    [Define if tp_debug_divert_messages() is provided by telepathy-glib]) ],
+  [], [$TP_GLIB_LIBS])
+
 AC_CHECK_LIB(purple, purple_dbus_uninit,
   [ AC_DEFINE(HAVE_PURPLE_DBUS_UNINIT, [],
     [Define if purple_dbus_uninit is present in libpurple]) ],
diff --git a/src/Makefile.am b/src/Makefile.am
index 924c8e6..aa4534f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ AM_CFLAGS = \
 	-DG_LOG_DOMAIN=\"haze\" \
 	$(ERROR_CFLAGS) \
 	@PURPLE_CFLAGS@ \
-	@TP_GLIB_CFLAGS@
+	@TP_GLIB_CFLAGS@ \
+	@DBUS_GLIB_CFLAGS@
 
-AM_LDFLAGS = @PURPLE_LIBS@ @TP_GLIB_LIBS@
+AM_LDFLAGS = @PURPLE_LIBS@ @TP_GLIB_LIBS@ @DBUS_GLIB_CFLAGS@
-- 
1.5.6.5