fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Simon McVittie 2016-11-09 18:44:21 +00:00
parent 44bc193efb
commit 5a1dcca8bf
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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])

5
test/Makefile.am
View file

@ -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