From b7d7602750acad857b638811b7a9096982460b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Sat, 3 Mar 2018 21:55:15 +0000 Subject: [PATCH] Make wayland bits in meson.build conditional on wayland use Otherwise the build won't configure due to its inability to find wayland-scanner program on systems where no such program is availble. https://bugzilla.gnome.org/show_bug.cgi?id=773299 --- gtk/meson.build | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index a0b3932d57..fa1f7b2908 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -596,8 +596,10 @@ proto_sources = [ ] im_wayland_sources = files('gtkimcontextwayland.c') -wayland_scanner = find_program('wayland-scanner') -genprotocols = find_program('../gdk/wayland/genprotocolfiles.py') +if wayland_enabled + wayland_scanner = find_program('wayland-scanner') + genprotocols = find_program('../gdk/wayland/genprotocolfiles.py') +endif foreach p: proto_sources proto_name = p.get(0) @@ -612,25 +614,27 @@ foreach p: proto_sources input = join_paths(proto_dir, '@0@/@1@/@2@.xml'.format(proto_stability, proto_name, output_base)) endif - im_wayland_sources += custom_target('@0@ client header'.format(output_base), - input: input, - output: '@0@-client-protocol.h'.format(output_base), - command: [ - genprotocols, - wayland_scanner, - '@INPUT@', '@OUTPUT@', - 'client-header', - ]) + if wayland_enabled + im_wayland_sources += custom_target('@0@ client header'.format(output_base), + input: input, + output: '@0@-client-protocol.h'.format(output_base), + command: [ + genprotocols, + wayland_scanner, + '@INPUT@', '@OUTPUT@', + 'client-header', + ]) - im_wayland_sources += custom_target('@0@ source'.format(output_base), - input: input, - output: '@0@-protocol.c'.format(output_base), - command: [ - genprotocols, - wayland_scanner, - '@INPUT@', '@OUTPUT@', - 'code', - ]) + im_wayland_sources += custom_target('@0@ source'.format(output_base), + input: input, + output: '@0@-protocol.c'.format(output_base), + command: [ + genprotocols, + wayland_scanner, + '@INPUT@', '@OUTPUT@', + 'code', + ]) + endif endforeach if os_unix