From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 21 Mar 2025 13:58:58 +0000 (+0100)
Subject: dnsdist: Fix CDB being automatically picked up when disabled
X-Git-Tag: dnsdist-2.0.0-alpha2~114^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51ab182cb2cd471899e112f886daf753dda13330;p=thirdparty%2Fpdns.git

dnsdist: Fix CDB being automatically picked up when disabled
---

diff --git a/pdns/dnsdistdist/meson/cdb/meson.build b/pdns/dnsdistdist/meson/cdb/meson.build
index 4616773175..b19da1b192 100644
--- a/pdns/dnsdistdist/meson/cdb/meson.build
+++ b/pdns/dnsdistdist/meson/cdb/meson.build
@@ -1,9 +1,12 @@
-dep_cdb = dependency('libcdb', required: false)
+opt_cdb = get_option('cdb')
+dep_cdb = dependency('libcdb', required: opt_cdb)
 
-if not dep_cdb.found()
-  if cxx.has_header('cdb.h', required: false)
-    if cxx.has_function('cdb_find', args: ['-lcdb'])
-      dep_cdb = declare_dependency(link_args: ['-lcdb'])
+if opt_cdb.allowed()
+  if not dep_cdb.found()
+    if cxx.has_header('cdb.h', required: false)
+      if cxx.has_function('cdb_find', args: ['-lcdb'])
+        dep_cdb = declare_dependency(link_args: ['-lcdb'])
+      endif
     endif
   endif
 endif