Commit 5a1dcca8 authored by Simon McVittie's avatar Simon McVittie

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

Signed-off-by: 's avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall's avatarPhilip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98665
parent 44bc193e
......@@ -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])
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment