Attachment 127874 Details for Bug 98665 – Don't test X11 autolaunching if it was disabled at compile time

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

0002-Don-t-test-X11-autolaunching-if-it-was-disabled-at-c.patch (text/plain), 1.28 KB, created by Simon McVittie on 2016-11-09 19:39:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2016-11-09 19:39:02 UTC

Size: 1.28 KB

patch

obsolete

>From bdf30196cd98f52cf3fc3b2d62d87d2a00ab75ba Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 9 Nov 2016 18:44:21 +0000
>Subject: [PATCH 2/9] Don't test X11 autolaunching if it was disabled at
> compile time
>
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> configure.ac     | 2 ++
> test/Makefile.am | 5 +++++
> 2 files changed, 7 insertions(+)
>
>diff --git a/configure.ac b/configure.ac
>index f58827f..73cecae 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -1343,6 +1343,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 eaf2df8..bbd01d0 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -183,8 +183,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
>-- 
>2.10.2
>

Actions: View | Splinter Review

Attachments on bug 98665: 127874

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.