From faeb9fd6246e2e39b3deeaedcb1cd77903e04665 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 22 Sep 2023 15:24:52 +0200
Subject: [PATCH] dnsdist: Small cleanup of m4/pdns_with_quiche.m4

---
 pdns/dnsdistdist/Makefile.am            | 5 +++--
 pdns/dnsdistdist/m4/pdns_with_quiche.m4 | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index ad1519cdc5..c59dd4df4c 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -438,9 +438,10 @@ endif
 endif
 
 if HAVE_DNS_OVER_QUIC
-
 dnsdist_SOURCES += doq.cc
-
+if HAVE_QUICHE
+dnsdist_LDADD += $(QUICHE_LDFLAGS) $(QUICHE_LIBS)
+endif
 endif
 
 if HAVE_NGHTTP2
diff --git a/pdns/dnsdistdist/m4/pdns_with_quiche.m4 b/pdns/dnsdistdist/m4/pdns_with_quiche.m4
index 40d94ddb56..fc1d8d46a5 100644
--- a/pdns/dnsdistdist/m4/pdns_with_quiche.m4
+++ b/pdns/dnsdistdist/m4/pdns_with_quiche.m4
@@ -13,10 +13,6 @@ AC_DEFUN([PDNS_WITH_QUICHE], [
       PKG_CHECK_MODULES([QUICHE], [quiche], [
         [HAVE_QUICHE=1]
         AC_DEFINE([HAVE_QUICHE], [1], [Define to 1 if you have quiche])
-        save_CFLAGS=$CFLAGS
-        save_LIBS=$LIBS
-        CFLAGS="$QUICHE_CFLAGS $CFLAGS"
-        LIBS="$QUICHE_LIBS $LIBS"
       ], [ : ])
     ])
   ])
-- 
2.47.2