diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-09 18:44:21 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-22 19:27:43 +0000 |
| commit | 5a1dcca8bfe518a49575148bc9841918d7263018 (patch) | |
| tree | ff4a4f38371c68437c9d3f54ed53783bfc9b0da0 | |
| parent | 44bc193efb09b29388c02b9ab3015fddd6d42ade (diff) | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b75a1062..4899ef0c 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 7f4cdd08..914dd7f2 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 |