meson opt - also match options change in core meson build

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')

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),

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(

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(

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')]

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(

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(

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(

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(

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(

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')