From c0c439aaa7566098b18116cd977aa7a67cc6415e Mon Sep 17 00:00:00 2001
From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Mon, 6 Nov 2023 10:28:57 +0100
Subject: [PATCH] Meson: Create libpdns_cdb and use it in the tinydnsbackend

---
 modules/tinydnsbackend/meson.build |  5 +----
 pdns/meson.build                   | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/modules/tinydnsbackend/meson.build b/modules/tinydnsbackend/meson.build
index 0e0e76d129..4f809ea559 100644
--- a/modules/tinydnsbackend/meson.build
+++ b/modules/tinydnsbackend/meson.build
@@ -1,15 +1,12 @@
 sources = [
   'tinydnsbackend.cc',
-  # TODO Change this into a libpdns library
-  product_source_dir / 'pdns' / 'cdb.cc',
 ]
 
 extras = [
   'tinydnsbackend.hh',
-  product_source_dir / 'pdns' / 'cdb.hh',
 ]
 
-module_deps = [deps, dep_cdb]
+module_deps = [deps, dep_cdb, libpdns_cdb]
 
 lib = static_library(
   module_backend_name,
diff --git a/pdns/meson.build b/pdns/meson.build
index 1a40dba56f..385aa23bb6 100644
--- a/pdns/meson.build
+++ b/pdns/meson.build
@@ -1,5 +1,21 @@
 fs = import('fs')
 
+libpdns_cdb = dependency('', required: false)
+if dep_cdb.found()
+  libpdns_cdb = declare_dependency(
+    link_whole: static_library(
+      'libpdns-cdb',
+      'cdb.cc',
+      extra_files: [
+        'cdb.hh',
+      ],
+      dependencies: [
+        deps,
+      ],
+    )
+  )
+endif
+
 libpdns_bindlexer_cc = 'bindlexer.c'
 if not fs.is_file(libpdns_bindlexer_cc)
   flex = find_program('flex', required: true)
-- 
2.47.2