raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=385a91841c9f25f99cbe1371f2cddbf6c253abc8
commit 385a91841c9f25f99cbe1371f2cddbf6c253abc8 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri Jul 12 14:09:55 2019 +0100 meson opt - also match options change in core meson build --- meson.build | 4 ++-- src/modules/vkbd/meson.build | 2 +- src/modules/wl_buffer/meson.build | 2 +- src/modules/wl_desktop_shell/meson.build | 2 +- src/modules/wl_drm/meson.build | 2 +- src/modules/wl_fb/meson.build | 2 +- src/modules/wl_text_input/meson.build | 2 +- src/modules/wl_weekeyboard/meson.build | 2 +- src/modules/wl_wl/meson.build | 2 +- src/modules/wl_x11/meson.build | 2 +- src/modules/xwayland/meson.build | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meson.build b/meson.build index dea80a16b..e573ec8e3 100644 --- a/meson.build +++ b/meson.build @@ -275,7 +275,7 @@ dep_emotion = dependency('emotion' , required: true) dep_elementary = dependency('elementary' , required: true) dep_wayland = [] -if get_option('wayland') == true +if get_option('wl') == true wayland_protocols = dependency('wayland-protocols', version: '>= 1.12') dir_wayland_protocols = wayland_protocols.get_pkgconfig_variable('pkgdatadir') wayland_version = '>= 1.11.0' @@ -318,7 +318,7 @@ if get_option('wayland') == true endif dep_ecore_x = [] -if get_option('wayland') == true and get_option('wl-x11') == false and get_option('xwayland') == false +if get_option('wl') == true and get_option('wl-x11') == false and get_option('xwayland') == false config_h.set('HAVE_WAYLAND_ONLY', '1') else dep_ecore_x = dependency('ecore-x') diff --git a/src/modules/vkbd/meson.build b/src/modules/vkbd/meson.build index f884efc0d..693c47c2f 100644 --- a/src/modules/vkbd/meson.build +++ b/src/modules/vkbd/meson.build @@ -14,7 +14,7 @@ src = files( ) if get_option(m) == true - if get_option('wayland') == true + if get_option('wl') == true foreach p: [ '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols), '@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols), diff --git a/src/modules/wl_buffer/meson.build b/src/modules/wl_buffer/meson.build index a76f3be31..ed03157fd 100644 --- a/src/modules/wl_buffer/meson.build +++ b/src/modules/wl_buffer/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/wl_desktop_shell/meson.build b/src/modules/wl_desktop_shell/meson.build index 049258e53..05a05405a 100644 --- a/src/modules/wl_desktop_shell/meson.build +++ b/src/modules/wl_desktop_shell/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/wl_drm/meson.build b/src/modules/wl_drm/meson.build index 7c86f07f4..d8b427a49 100644 --- a/src/modules/wl_drm/meson.build +++ b/src/modules/wl_drm/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true or dep_ecore_drm2.found() != true +if get_option('wl') != true or dep_ecore_drm2.found() != true disable = true else deps = [dependency('elput'), dependency('libdrm')] diff --git a/src/modules/wl_fb/meson.build b/src/modules/wl_fb/meson.build index 93ef98eb2..6668e0432 100644 --- a/src/modules/wl_fb/meson.build +++ b/src/modules/wl_fb/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/wl_text_input/meson.build b/src/modules/wl_text_input/meson.build index c2adb3326..46cce134d 100644 --- a/src/modules/wl_text_input/meson.build +++ b/src/modules/wl_text_input/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/wl_weekeyboard/meson.build b/src/modules/wl_weekeyboard/meson.build index fc17e4672..8888156eb 100644 --- a/src/modules/wl_weekeyboard/meson.build +++ b/src/modules/wl_weekeyboard/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/wl_wl/meson.build b/src/modules/wl_wl/meson.build index a76f3be31..ed03157fd 100644 --- a/src/modules/wl_wl/meson.build +++ b/src/modules/wl_wl/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/wl_x11/meson.build b/src/modules/wl_x11/meson.build index a76f3be31..ed03157fd 100644 --- a/src/modules/wl_x11/meson.build +++ b/src/modules/wl_x11/meson.build @@ -1,4 +1,4 @@ -if get_option('wayland') != true +if get_option('wl') != true disable = true else src = files( diff --git a/src/modules/xwayland/meson.build b/src/modules/xwayland/meson.build index 7276a4591..9bd5e9819 100644 --- a/src/modules/xwayland/meson.build +++ b/src/modules/xwayland/meson.build @@ -5,7 +5,7 @@ src = files( no_icon = true -if get_option('wayland') != true +if get_option('wl') != true disable = true else xwayland = find_program('Xwayland') --
