From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 25 Aug 2021 09:00:27 +0000 (+0200)
Subject: dnsdist: Build with nghttp2 support when available
X-Git-Tag: dnsdist-1.7.0-alpha1~23^2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e95fabdab6824fb124c103f4dc88214f218940f4;p=thirdparty%2Fpdns.git

dnsdist: Build with nghttp2 support when available
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 27c2a1d9fd..5f5df90302 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -242,6 +242,7 @@ commands:
               libgnutls30 \
               libh2o-evloop0.13 \
               liblmdb0 \
+              libnghttp2-dev \
               libre2-5 \
               libssl-dev \
               libsystemd0 \
@@ -1543,6 +1544,7 @@ jobs:
             libgnutls28-dev \
             liblmdb-dev \
             libluajit-5.1-dev \
+            libnghttp2-dev \
             libre2-dev \
             libsnmp-dev \
             libsodium-dev \
@@ -1576,6 +1578,7 @@ jobs:
             --with-libsodium \
             --with-lua=luajit \
             --with-libcap \
+            --with-nghttp2 \
             --with-re2
           working_directory: /opt/project/pdns/dnsdistdist
       - run:
@@ -1697,6 +1700,7 @@ jobs:
             libh2o-evloop-dev \
             liblmdb-dev \
             libluajit-5.1-dev \
+            libnghttp2-dev \
             libre2-dev \
             libsnmp-dev \
             libsodium-dev \
@@ -1736,6 +1740,7 @@ jobs:
             --with-libsodium \
             --with-lua=luajit \
             --with-libcap \
+            --with-nghttp2 \
             --with-re2 \
             --enable-asan \
             --enable-ubsan
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a035dbd8de..cdaf72292a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -82,6 +82,7 @@ jobs:
                 liblmdb-dev \
                 liblua5.3-dev \
                 libmaxminddb-dev \
+                libnghttp2-dev \
                 libp11-kit-dev \
                 libpq-dev \
                 libre2-dev \
diff --git a/builder-support/debian/dnsdist/debian-buster/control b/builder-support/debian/dnsdist/debian-buster/control
index 132d767e62..624f518e52 100644
--- a/builder-support/debian/dnsdist/debian-buster/control
+++ b/builder-support/debian/dnsdist/debian-buster/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 10),
                liblmdb-dev,
                libluajit-5.1-dev [!arm64 !s390x],
                liblua5.3-dev [arm64 s390x],
+               libnghttp2-dev,
                libre2-dev,
                libsnmp-dev,
                libsodium-dev,
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 24eaa3e560..97cdb7fdbf 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -21,6 +21,7 @@ BuildRequires: systemd-devel
 BuildRequires: boost-devel
 BuildRequires: gnutls-devel
 BuildRequires: libcap-devel
+BuildRequires: libnghttp2-devel
 BuildRequires: lmdb-devel
 BuildRequires: libsodium-devel
 %ifarch aarch64