Merge pull request #15134 from rgacogne/ddist-quiche-version-fallback

dnsdist: Gracefully fall back to older versions of Quiche
PowerDNS · Feb 10, 2025 · 85d0037 · 85d0037
2 parents 5053ff6 + 7a81086
commit 85d0037
Showing 1 changed file with 6 additions and 4 deletions.
diff --git 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