diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 11:49:10 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 14:57:14 +0000 |
| commit | 38d94e42ee89b5bb93ecdebf0db4d176d824e7b6 (patch) | |
| tree | 30effcb533f28d49406c54f8cb45cecf792b1a18 | |
| parent | 0959f367df8b53ee63e54e369caaf6b4572a06af (diff) | |
Track telepathy-glib-1-dbus CFLAGS, LIBS separately
Ideally, we'd like only the tests to use these, but we don't have
a Tp.Contact.set_alias_async method yet.
Reviewed-by: Xavier Claessens
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=708871
| -rw-r--r-- | backends/telepathy/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/lib/telepathy/contactlist/Makefile.am | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index 4a5b5fb6..d476506c 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -49,6 +49,7 @@ libtp_lowlevel_la_CFLAGS = \ $(backend_library_cflags_generic) \ $(C_ERROR_CFLAGS) \ $(TP_GLIB_CFLAGS) \ + $(TP_GLIB_DBUS_CFLAGS) \ $(NULL) # the -shared and -rpath arguments are to force it to be compiled to a .so, @@ -62,6 +63,7 @@ libtp_lowlevel_la_LDFLAGS = \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(TP_GLIB_LIBS) \ + $(TP_GLIB_DBUS_LIBS) \ $(NULL) if HAVE_VALA diff --git a/configure.ac b/configure.ac index 03bd4b11..00cce9af 100644 --- a/configure.ac +++ b/configure.ac @@ -283,10 +283,10 @@ PKG_CHECK_MODULES([GEE], [gee-0.8 >= $GEE_REQUIRED]) TP_GLIB_REQUIRED=0.99.7 AS_IF([test x$enable_telepathy_backend = xyes], [ - PKG_CHECK_MODULES([TP_GLIB], [ - telepathy-glib-1 >= $TP_GLIB_REQUIRED - telepathy-glib-1-dbus >= $TP_GLIB_REQUIRED - ])]) + PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib-1 >= $TP_GLIB_REQUIRED]) + PKG_CHECK_MODULES([TP_GLIB_DBUS], + [telepathy-glib-1-dbus >= $TP_GLIB_REQUIRED]) +]) case "x$enable_zeitgeist" in xyes) AS_IF([test x$enable_telepathy_backend = xyes], diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am index 4000650c..14459f0e 100644 --- a/tests/lib/telepathy/contactlist/Makefile.am +++ b/tests/lib/telepathy/contactlist/Makefile.am @@ -47,10 +47,12 @@ libtp_test_contactlist_la_CFLAGS = \ $(ERROR_CFLAGS) \ $(C_ERROR_CFLAGS) \ $(TP_GLIB_CFLAGS) \ + $(TP_GLIB_DBUS_CFLAGS) \ $(DBUS_GLIB_CFLAGS) \ $(NULL) libtp_test_contactlist_la_LIBADD = \ $(TP_GLIB_LIBS) \ + $(TP_GLIB_DBUS_LIBS) \ $(DBUS_GLIB_LIBS) \ $(NULL) @@ -74,7 +76,7 @@ INTROSPECTION_SCANNER_ENV = \ tp-test-contactlist.gir: $(libtp_test_contactlist_la_SOURCES) \ libtp-test-contactlist.la tp_test_contactlist_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12 -tp_test_contactlist_gir_CFLAGS = $(TP_GLIB_CFLAGS) +tp_test_contactlist_gir_CFLAGS = $(TP_GLIB_CFLAGS) $(TP_GLIB_DBUS_CFLAGS) tp_test_contactlist_gir_LIBS = libtp-test-contactlist.la tp_test_contactlist_gir_FILES = $(libtp_test_contactlist_la_SOURCES) tp_test_contactlist_gir_NAMESPACE = TpTests |