diff --git a/meson.build b/meson.build index 73c2bf9b1..01e22b6a9 100644 --- a/meson.build +++ b/meson.build @@ -205,36 +205,35 @@ libxcvt_dep = dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], requir build_xwayland = false if (host_machine.system() != 'darwin' and - host_machine.system() != 'windows') - if get_option('xwayland') != 'false' - xwayland_required = get_option('xwayland') == 'true' - build_glamor = glamor_option == 'true' or glamor_option == 'auto' + host_machine.system() != 'windows' and + get_option('xwayland') != 'false') + xwayland_required = get_option('xwayland') == 'true' + build_glamor = glamor_option == 'true' or glamor_option == 'auto' - xwayland_path = get_option('xwayland-path') - if (xwayland_path == '') - xwayland_path = join_paths(get_option('prefix'), get_option('bindir')) - endif - - wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required) - xwayland_dep = [ - wayland_client_dep, - dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required), - dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required), - ] - - if build_glamor - xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required) - xwayland_dep += dependency('epoxy', required: xwayland_required) - endif - - build_xwayland = true - # check for all the deps being found, to handle 'auto' mode. - foreach d: xwayland_dep - if not d.found() - build_xwayland = false - endif - endforeach + xwayland_path = get_option('xwayland-path') + if (xwayland_path == '') + xwayland_path = join_paths(get_option('prefix'), get_option('bindir')) endif + + wayland_client_dep = dependency('wayland-client', version: wayland_req, required: xwayland_required) + xwayland_dep = [ + wayland_client_dep, + dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required), + dependency('libxcvt', fallback: ['libxcvt', 'libxcvt_dep'], required: xwayland_required), + ] + + if build_glamor + xwayland_dep += dependency('libdrm', version: libdrm_req, required: xwayland_required) + xwayland_dep += dependency('epoxy', required: xwayland_required) + endif + + build_xwayland = true + # check for all the deps being found, to handle 'auto' mode. + foreach d: xwayland_dep + if not d.found() + build_xwayland = false + endif + endforeach else wayland_client_dep = dependency('', required: false) endif