From a0a6b9ac5b6161cce5ac058b66f4d10c89aed9ac Mon Sep 17 00:00:00 2001
From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Thu, 11 Jan 2024 15:38:16 +0100
Subject: [PATCH] Meson: Rework how ext/ is handled

---
 ext/meson.build |  3 ---
 meson.build     | 17 +++++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 ext/meson.build

diff --git a/ext/meson.build b/ext/meson.build
deleted file mode 100644
index 9043be53a1..0000000000
--- a/ext/meson.build
+++ /dev/null
@@ -1,3 +0,0 @@
-foreach module: ext_modules
-  subdir(module)
-endforeach
diff --git a/meson.build b/meson.build
index 17aefe8592..2e0a7c72d5 100644
--- a/meson.build
+++ b/meson.build
@@ -95,18 +95,15 @@ subdir('meson' / 'cxx-fs')                  # C++ stdlib Filesystem Module
 # TODO Generate pdns_server.1 manpage
 
 # Ext
-ext_modules = [
-  'arc4random',
-  'ipcrypt',
-  'json11',
-  'luawrapper',
-  'protozero',
-  'yahttp',
-]
+subdir('ext' / 'arc4random')
+subdir('ext' / 'ipcrypt')
+subdir('ext' / 'json11')
+subdir('ext' / 'luawrapper')
+subdir('ext' / 'protozero')
+subdir('ext' / 'yahttp')
 if get_option('module-lmdb') != 'disabled'
-  ext_modules += 'lmdb-safe'
+  subdir('ext' / 'lmdb-safe')
 endif
-subdir('ext')
 
 deps = [
   dep_pdns,
-- 
2.47.3