From 3504bb587daade365c11bd91568bc175b303be57 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 4 Feb 2021 17:31:12 +0100 Subject: xwayland: add dependency on xwayland Check that the pkg-config file is available. This will be required in the future to check whether xwayland supports features such as -listenfd, -initfd or -verbose. If there's no pkg-config file, check that the Xwayland executable is available. This effectively makes our relationship with xwayland closer to what a dynamic library is: checked at build-time, but can be overridden at run-time. --- xwayland/meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'xwayland') diff --git a/xwayland/meson.build b/xwayland/meson.build index e7956759..a4b51bf2 100644 --- a/xwayland/meson.build +++ b/xwayland/meson.build @@ -18,6 +18,19 @@ if not get_option('xwayland').disabled() msg += 'Required for Xwayland support.' endif +xwayland = dependency('xwayland', required: false) +if not xwayland.found() + # There's no Xwayland release with the pkg-config file shipped yet. + xwayland_prog = find_program('Xwayland', required: false) + if not xwayland_prog.found() + if get_option('xwayland').enabled() + error('\n'.join(msg).format('xwayland')) + else + subdir_done() + endif + endif +endif + foreach lib : xwayland_required dep = dependency(lib, required: get_option('xwayland'), -- cgit v1.2.3