From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 7 Feb 2025 15:01:50 +0000 (+0100)
Subject: dnsdist: Gracefully fall back to older versions of Quiche
X-Git-Tag: dnsdist-2.0.0-alpha1~115^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15134%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Gracefully fall back to older versions of Quiche

Before this commit we only tried older versions of Quiche if the
`quiche` feature was not explicitely enabled, and failed otherwise.
---

diff --git a/pdns/dnsdistdist/meson/quiche/meson.build b/pdns/dnsdistdist/meson/quiche/meson.build
index d03aade91f..31980cf6b9 100644
--- a/pdns/dnsdistdist/meson/quiche/meson.build
+++ b/pdns/dnsdistdist/meson/quiche/meson.build
@@ -1,18 +1,20 @@
 dep_libquiche = dependency('', required: false)
 opt_libquiche = get_option('quiche')
+opt_quic = get_option('dns-over-quic')
+opt_doh3 = get_option('dns-over-http3')
 
-if (get_option('dns-over-quic') or get_option('dns-over-http3')) and opt_libquiche.allowed()
-  dep_libquiche = dependency('quiche', version: '>= 0.23.0', required: opt_libquiche)
+if (opt_quic or opt_doh3) and opt_libquiche.allowed()
+  dep_libquiche = dependency('quiche', version: '>= 0.23.0', required: false)
   if dep_libquiche.found()
     conf.set('HAVE_QUICHE_H3_EVENT_HEADERS_HAS_MORE_FRAMES', dep_libquiche.found(), description: 'if the Quiche API has quiche_h3_event_headers_has_more_frames instead of quiche_h3_event_headers_has_body')
   else
-    dep_libquiche = dependency('quiche', version: '>= 0.22.0', required: opt_libquiche)
+    dep_libquiche = dependency('quiche', version: '>= 0.22.0', required: false)
   endif
 
   if dep_libquiche.found()
     conf.set('HAVE_QUICHE_STREAM_ERROR_CODES', dep_libquiche.found(), description: 'if the Quiche API includes error code in quiche_conn_stream_recv and quiche_conn_stream_send')
   else
-    dep_libquiche = dependency('quiche', version: '>= 0.15.0', required: opt_libquiche)
+    dep_libquiche = dependency('quiche', version: '>= 0.15.0', required: opt_libquiche or opt_quic or opt_doh3)
   endif
 endif