3 files changed, 5 insertions, 3 deletions
diff --git a/src/intel/meson.build b/src/intel/meson.build
index 7b6aa40ba8d..528146f3bb7 100644
--- a/src/intel/meson.build
+++ b/src/intel/meson.build
@@ -28,7 +28,7 @@ subdir('isl')
 subdir('common')
 subdir('compiler')
 subdir('perf')
-if with_tools.contains('intel') or with_tools.contains('intel-ui')
+if with_intel_tools
   subdir('tools')
 endif
 if with_intel_vk
diff --git a/src/meson.build b/src/meson.build
index cefa1c9ac28..53b999ad22a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -60,7 +60,9 @@ subdir('compiler')
 if with_tools.contains('drm-shim')
   subdir('drm-shim')
 endif
-subdir('imgui')
+if with_imgui
+  subdir('imgui')
+endif
 if with_platform_wayland
   subdir('egl/wayland/wayland-drm')
 endif
diff --git a/src/vulkan/meson.build b/src/vulkan/meson.build
index 7900938b355..e1e8f753b50 100644
--- a/src/vulkan/meson.build
+++ b/src/vulkan/meson.build
@@ -59,6 +59,6 @@ endif
 
 subdir('util')
 subdir('wsi')
-if get_option('vulkan-overlay-layer')
+if with_vulkan_overlay_layer
   subdir('overlay-layer')
 endif