[glib/gdbus-daemon2: 3/8] Tests: Move dbus specific tests to if HAVE_DBUS_DAEMON

[Alexander Larsson <alexl src gnome org>]

commit 21e049b2539d492cd4e959e5c962245d33adf8ca
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Apr 19 18:12:23 2012 +0200

    Tests: Move dbus specific tests to if HAVE_DBUS_DAEMON
    
    These used to only be built on unix, but if you have dbus-daemon on
    win32 we should really build them there too.

 configure.ac          |    3 +++
 gio/tests/Makefile.am |   16 +++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 466cf43..bcb7cd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3467,6 +3467,9 @@ if test x$enable_modular_tests = xyes; then
 fi
 AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"])
 
+AC_CHECK_PROGS([DBUS_DAEMON], [dbus-daemon])
+AM_CONDITIONAL([HAVE_DBUS_DAEMON], [test x$DBUS_DAEMON = xdbus-daemon ])
+
 dnl
 dnl Check for -Bsymbolic-functions linker flag used to avoid
 dnl intra-library PLT jumps, if available.
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 1321533..79878da 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -61,12 +61,10 @@ TEST_PROGS +=	 		\
 	resources		\
 	$(NULL)
 
-if OS_UNIX
+if HAVE_DBUS_DAEMON
 TEST_PROGS +=			\
 	actions 		\
-	gdbus-close-pending	\
 	gdbus-connection	\
-	gdbus-connection-flush	\
 	gdbus-connection-loss	\
 	gdbus-connection-slow	\
 	gdbus-names		\
@@ -77,11 +75,19 @@ TEST_PROGS +=			\
 	gdbus-threading		\
 	gdbus-export		\
 	gdbus-error		\
+	gdbus-bz627724		\
+	gmenumodel		\
+	$(NULL)
+endif
+
+
+if OS_UNIX
+TEST_PROGS +=			\
+	gdbus-close-pending	\
+	gdbus-connection-flush	\
 	gdbus-peer		\
 	gdbus-exit-on-close	\
 	gdbus-non-socket	\
-	gdbus-bz627724		\
-	gmenumodel		\
 	appinfo			\
 	contenttype		\
 	mimeapps		\