From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 27 Sep 2024 09:29:48 +0000 (+0200)
Subject: dnsdist: Fix building with meson without all options enabled
X-Git-Tag: dnsdist-2.0.0-alpha1~128^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd00d04c5819e60cc1ad6aaed709b32e360dd0e6;p=thirdparty%2Fpdns.git

dnsdist: Fix building with meson without all options enabled
---

diff --git a/pdns/dnsdistdist/dnsdist-nghttp2-in.cc b/pdns/dnsdistdist/dnsdist-nghttp2-in.cc
index c93a8a3c95..2b19ecdeb2 100644
--- a/pdns/dnsdistdist/dnsdist-nghttp2-in.cc
+++ b/pdns/dnsdistdist/dnsdist-nghttp2-in.cc
@@ -19,15 +19,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+#include "dnsdist-nghttp2-in.hh"
+
+#if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2)
 
 #include "dnsdist-dnsparser.hh"
 #include "dnsdist-doh-common.hh"
-#include "dnsdist-nghttp2-in.hh"
 #include "dnsdist-proxy-protocol.hh"
 #include "dnsparser.hh"
 
-#if defined(HAVE_DNS_OVER_HTTPS) && defined(HAVE_NGHTTP2)
-
 #if 0
 class IncomingDoHCrossProtocolContext : public CrossProtocolContext
 {
diff --git a/pdns/dnsdistdist/doh3.hh b/pdns/dnsdistdist/doh3.hh
index 9e021c6114..14850fcc70 100644
--- a/pdns/dnsdistdist/doh3.hh
+++ b/pdns/dnsdistdist/doh3.hh
@@ -33,7 +33,6 @@
 #include "iputils.hh"
 #include "libssl.hh"
 #include "stat_t.hh"
-#include "dnsdist-idstate.hh"
 
 struct DOH3ServerConfig;
 struct DownstreamState;
@@ -46,6 +45,7 @@ using h3_headers_t = std::unordered_map<std::string, std::string>;
 
 #ifdef HAVE_DNS_OVER_HTTP3
 
+#include "dnsdist-idstate.hh"
 #include "doq-common.hh"
 
 struct DOH3Frontend
diff --git a/pdns/dnsdistdist/doq.hh b/pdns/dnsdistdist/doq.hh
index 4b0d2dc550..66b64953df 100644
--- a/pdns/dnsdistdist/doq.hh
+++ b/pdns/dnsdistdist/doq.hh
@@ -30,13 +30,13 @@
 #include "noinitvector.hh"
 #include "doq.hh"
 #include "stat_t.hh"
-#include "dnsdist-idstate.hh"
 
 struct DOQServerConfig;
 struct DownstreamState;
 
 #ifdef HAVE_DNS_OVER_QUIC
 
+#include "dnsdist-idstate.hh"
 #include "doq-common.hh"
 
 struct DOQFrontend
diff --git a/pdns/dnsdistdist/meson/cdb/meson.build b/pdns/dnsdistdist/meson/cdb/meson.build
index 0b7870b056..b05ee9dfc9 100644
--- a/pdns/dnsdistdist/meson/cdb/meson.build
+++ b/pdns/dnsdistdist/meson/cdb/meson.build
@@ -1,5 +1,3 @@
-dep_cdb = dependency('', required: false)
-
 dep_cdb = dependency('libcdb', required: false)
 
 if not dep_cdb.found()
diff --git a/pdns/dnsdistdist/meson/libsnmp/meson.build b/pdns/dnsdistdist/meson/libsnmp/meson.build
index 208d8581ed..cdf26a9e5b 100644
--- a/pdns/dnsdistdist/meson/libsnmp/meson.build
+++ b/pdns/dnsdistdist/meson/libsnmp/meson.build
@@ -1,8 +1,8 @@
 opt_libsnmp = get_option('snmp')
 
-dep_libsnmp = declare_dependency()
+dep_libsnmp = dependency('', required: false)
 
-if get_option('snmp')
+if opt_libsnmp
     snmp_config = find_program('net-snmp-config', required: true)
     snmp_ldflags_res = run_command(snmp_config, '--netsnmp-agent-libs', check: true)
     snmp_ldflags = snmp_ldflags_res.stdout().strip().split()
diff --git a/pdns/dnsdistdist/meson/quiche/meson.build b/pdns/dnsdistdist/meson/quiche/meson.build
index c680f035ab..0774c1a58d 100644
--- a/pdns/dnsdistdist/meson/quiche/meson.build
+++ b/pdns/dnsdistdist/meson/quiche/meson.build
@@ -1,4 +1,4 @@
-dep_libquiche = declare_dependency()
+dep_libquiche = dependency('', required: false)
 opt_libquiche = get_option('quiche')
 
 if (get_option('dns-over-quic') or get_option('dns-over-http3')) and opt_libquiche.allowed()