meson: Only build src/x11 if with_platform_x11

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36123>

src/egl/meson.build

@@ -94,7 +94,6 @@ if with_dri
   deps_for_egl += idep_xmlconfig
   link_for_egl += libloader
   incs_for_egl += inc_loader
-  incs_for_egl += inc_loader_x11
   incs_for_egl += inc_gallium
   incs_for_egl += inc_gallium_aux
   incs_for_egl += inc_mesa
@@ -107,9 +106,10 @@ if with_dri
 
   if with_platform_x11
     files_egl += files('drivers/dri2/platform_x11.c')
+    incs_for_egl += inc_loader_x11
+    link_for_egl += libloader_x11
     if with_dri_platform == 'drm'
       files_egl += files('drivers/dri2/platform_x11_dri3.c')
-      link_for_egl += [libloader_x11]
     endif
     deps_for_egl += [dep_x11_xcb, dep_xcb_xrandr, dep_xcb_xfixes, dep_xcb_shm]
   endif

src/gallium/auxiliary/meson.build

@@ -427,6 +427,7 @@ files_libgalliumvl = files(
 
 vlwinsys_deps = []
 files_libgalliumvlwinsys = files('vl/vl_winsys.h')
+links_libgalliumvlwinsys = []
 if host_machine.system() == 'windows'
   files_libgalliumvlwinsys += files('vl/vl_winsys_win32.c')
 else
@@ -434,6 +435,7 @@ else
 endif
 if with_platform_x11
   files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c')
+  links_libgalliumvlwinsys += libloader_x11
   if with_dri_platform == 'drm'
     vlwinsys_deps += [
       dep_xcb_sync, dep_xcb_present, dep_xshmfence, dep_xcb_xfixes,
@@ -572,6 +574,6 @@ libgalliumvlwinsys = static_library(
   files_libgalliumvlwinsys,
   include_directories : [inc_gallium, inc_include, inc_loader, inc_src, include_directories('../drivers/zink')],
   dependencies : [dep_libdrm, vlwinsys_deps, idep_mesautil],
-  link_with : [libloader_x11],
+  link_with : links_libgalliumvlwinsys,
   build_by_default : false,
 )

src/meson.build

@@ -47,7 +47,9 @@ if cc.get_argument_syntax() == 'msvc'
 else
   idep_getopt = null_dep
 endif
-subdir('x11')
+if with_platform_x11
+  subdir('x11')
+endif
 if with_gallium_or_lvp or with_gbm or with_platform_wayland
   subdir('loader')
 endif

src/x11/meson.build

@@ -3,7 +3,7 @@
 
 inc_loader_x11 = include_directories('.')
 
-if with_platform_x11 and with_dri_platform == 'drm'
+if with_dri_platform == 'drm'
   libloader_x11 = static_library(
     'loader_x11',
     'loader_x11.c',