From ead83319962a31df5994c820a7271bfbc9895663 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 23 Jul 2025 16:28:53 +0200
Subject: [PATCH] kdrive: move ephyr build option check into kdrive's
 meson.build

As more kdrive-based servers are coming, it's time to refactor the meson
structure a little bit, so all kdrive specific logic is in its own subdir.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/kdrive/meson.build | 12 ++++++++++--
 hw/meson.build        |  4 +---
 meson.build           |  1 -
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/hw/kdrive/meson.build b/hw/kdrive/meson.build
index 16341e2281..d6e35d48e7 100644
--- a/hw/kdrive/meson.build
+++ b/hw/kdrive/meson.build
@@ -1,2 +1,10 @@
-subdir('src')
-subdir('ephyr')
+build_xephyr = get_option('xephyr')
+build_kdrive = build_xephyr
+
+if build_kdrive
+    subdir('src')
+endif
+
+if build_xephyr
+    subdir('ephyr')
+endif
diff --git a/hw/meson.build b/hw/meson.build
index fb9e5d431c..73ec936399 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,4 @@
-if build_xephyr
-    subdir('kdrive')
-endif
+subdir('kdrive')
 
 if build_xvfb
     subdir('vfb')
diff --git a/meson.build b/meson.build
index f284b824de..d543f69ed3 100644
--- a/meson.build
+++ b/meson.build
@@ -240,7 +240,6 @@ if build_xquartz
     build_rootless = true
 endif
 
-build_xephyr = get_option('xephyr')
 build_xvfb = get_option('xvfb')
 
 summary({