[Mesa-dev] [PATCH mesa 3/3] meson: fix wayland-less builds

[Eric Engestrom]

Those empty variables in the !wayland case are useless and running that
meson.build with them breaks the build:

  [287/850] Generating wayland-drm-client-protocol.h with a custom command.
  FAILED: src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  client-header ../src/egl/wayland/wayland-drm/wayland-drm.xml src/egl/wayland/wayland-drm/wayland-drm-client-protocol.h
  /bin/sh: client-header: command not found
  ninja: build stopped: subcommand failed.

Fixes: d1992255bb29054fa5176 "meson: Add build Intel "anv" vulkan driver"
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
---
Kind of amazed that no one has tried to build with wayland disabled
since meson was introduced, but I guess it's a good thing ^^'
---
 meson.build     | 7 -------
 src/meson.build | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 0276b11e9cf003f6ebde..fcde41387ac2581ccad0 100644
--- a/meson.build
+++ b/meson.build
@@ -1315,13 +1315,6 @@ if with_platform_wayland
     'linux-dmabuf', 'linux-dmabuf-unstable-v1.xml'
   )
   pre_args += ['-DHAVE_WAYLAND_PLATFORM', '-DWL_HIDE_DEPRECATED']
-else
-  prog_wl_scanner = []
-  wl_scanner_arg = ''
-  dep_wl_protocols = null_dep
-  dep_wayland_client = null_dep
-  dep_wayland_server = null_dep
-  wayland_dmabuf_xml = ''
 endif
 
 dep_x11 = null_dep
diff --git a/src/meson.build b/src/meson.build
index 2b8fcc36be5b0b1688ec..75f642018f03ecfef562 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -56,7 +56,9 @@ if with_gles1 or with_gles2 or with_shared_glapi
 endif
 # TODO: opengl
 subdir('compiler')
-subdir('egl/wayland/wayland-drm')
+if with_platform_wayland
+  subdir('egl/wayland/wayland-drm')
+endif
 if with_any_vk
   subdir('vulkan')
 endif
-- 
Cheers,
  Eric