tests: use GTestDBus only if glib >= 2.34

diff --git a/configure.ac b/configure.ac
index 23f0361..f36f115 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,9 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [have_check=yes], [have_check=no])
 AC_SUBST(CHECK_CFLAGS)
 AC_SUBST(CHECK_LIBS)
 
+PKG_CHECK_MODULES(GTestDBus, glib-2.0 >= 2.34, [gtestdbus=yes], [gtestdbus=no])
+AM_CONDITIONAL(HAVE_GTESTDBUS, [test x$gtestdbus = xyes])
+
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 
 DBUS_SERVICES_DIR="`pkg-config --variable session_bus_services_dir dbus-1`"

diff --git a/test/daemon/Makefile.am b/test/daemon/Makefile.am
index 933fe34..70a13c2 100644 (file)
--- a/test/daemon/Makefile.am
+++ b/test/daemon/Makefile.am
@@ -1,6 +1,6 @@
+if HAVE_GTESTDBUS
 TESTS = daemontest
 check_PROGRAMS = $(TESTS)
-noinst_PROGRAMS = $(TESTS)
 
 daemontest_SOURCES = daemon-test.c
 
@@ -18,4 +18,6 @@ daemontest_LDADD = \
     $(GSIGNOND_LIBS) \
     $(CHECK_LIBS)
 
+endif
+
 EXTRA_DIST = "$(top_builddir)/test/daemon/services/com.google.code.AccountsSSO.SingleSignOn.service.in"