From: Simon McVittie <smcv@collabora.com>
Date: Fri, 24 Jun 2022 16:53:12 +0000 (+0100)
Subject: build: Define x11 to an empty dependency if X11 autolaunch is disabled
X-Git-Tag: dbus-1.15.0~32^2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=179669fa7c7647b6810a6a0d25f1726c6de4c953;p=thirdparty%2Fdbus.git

build: Define x11 to an empty dependency if X11 autolaunch is disabled

Otherwise, we can't build successfully for Windows with X11 autolaunch
explicitly disabled.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/meson.build b/meson.build
index 4c3690a22..937f64381 100644
--- a/meson.build
+++ b/meson.build
@@ -501,6 +501,7 @@ endif
 
 if get_option('x11_autolaunch').disabled()
     use_x11_autolaunch = false
+    x11 = not_found
 else
     if get_option('x11_autolaunch').enabled() and platform_windows
         error('X11 autolaunch is not supported on Windows')