From 365ea2fd56fdd3d69ef6e09c5955709419891300 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Sat, 1 Dec 2018 12:02:05 +0800 Subject: [PATCH] build: Don't check for Xwayland when Wayland is disabled --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index af156d189..0a824e750 100644 --- a/meson.build +++ b/meson.build @@ -287,11 +287,13 @@ cdata.set('HAVE_INTROSPECTION', have_introspection) xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') cdata.set_quoted('XKB_BASE', xkb_base) -xwayland_path = get_option('xwayland_path') -if xwayland_path == '' - xwayland_path = find_program('Xwayland').path() +if have_wayland + xwayland_path = get_option('xwayland_path') + if xwayland_path == '' + xwayland_path = find_program('Xwayland').path() + endif + cdata.set_quoted('XWAYLAND_PATH', xwayland_path) endif -cdata.set_quoted('XWAYLAND_PATH', xwayland_path) xwayland_grab_default_access_rules = get_option('xwayland_grab_default_access_rules') cdata.set_quoted('XWAYLAND_GRAB_DEFAULT_ACCESS_RULES',