From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 9 Nov 2016 18:44:21 +0000 (+0000)
Subject: Don't test X11 autolaunching if it was disabled at compile time
X-Git-Tag: dbus-1.10.14~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a1dcca8bfe518a49575148bc9841918d7263018;p=thirdparty%2Fdbus.git

Don't test X11 autolaunching if it was disabled at compile time

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98665
---

diff --git a/configure.ac b/configure.ac
index b75a10629..4899ef0c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1336,6 +1336,8 @@ fi
 if test "x$enable_x11_autolaunch" = xyes ; then
    AC_DEFINE([DBUS_ENABLE_X11_AUTOLAUNCH], [1], [Define to enable X11 auto-launch])
 fi
+AM_CONDITIONAL([DBUS_ENABLE_X11_AUTOLAUNCH],
+  [test "x$enable_x11_autolaunch" = xyes])
 
 AC_SUBST([DBUS_X_CFLAGS])
 AC_SUBST([DBUS_X_LIBS])
diff --git a/test/Makefile.am b/test/Makefile.am
index 7f4cdd086..914dd7f2f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -172,8 +172,13 @@ dist_installable_test_scripts += \
 if DBUS_ENABLE_EMBEDDED_TESTS
 dist_installable_test_scripts += \
 	test-dbus-launch-eval.sh \
+	$(NULL)
+
+if DBUS_ENABLE_X11_AUTOLAUNCH
+dist_installable_test_scripts += \
 	test-dbus-launch-x11.sh \
 	$(NULL)
+endif DBUS_ENABLE_X11_AUTOLAUNCH
 endif DBUS_ENABLE_EMBEDDED_TESTS
 
 endif DBUS_UNIX