[mutter/wip/lantw/fix-meson-build-on-freebsd: 1/2] build: Don't check for Xwayland when Wayland is disabled
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/lantw/fix-meson-build-on-freebsd: 1/2] build: Don't check for Xwayland when Wayland is disabled
- Date: Sat, 1 Dec 2018 05:39:05 +0000 (UTC)
commit 49cad76162ec1e5448065e3825aa53432c1c5072
Author: Ting-Wei Lan <lantw src gnome org>
Date: Sat Dec 1 12:02:05 2018 +0800
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',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]