]> granicus.if.org Git - pdns/commitdiff
Merge pull request #7726 from rgacogne/dnsdist-redoh
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Tue, 23 Apr 2019 12:07:29 +0000 (14:07 +0200)
committerGitHub <noreply@github.com>
Tue, 23 Apr 2019 12:07:29 +0000 (14:07 +0200)
dnsdist: Add DNS over HTTPS support based on libh2o

1  2 
builder-support/debian/dnsdist/debian-stretch/rules
builder-support/specs/dnsdist.spec
pdns/Makefile.am
pdns/dnsdist.cc
regression-tests.dnsdist/dnsdisttests.py

index b9ad262d9c003c4a307c8199edb83b5a2408eeaa,9d870ed196703f53ca92f9771177934af900688d..4ae2ee8a810c18eaa88726d3301b6f610248ab89
@@@ -28,8 -28,8 +28,9 @@@ override_dh_auto_clean
        dh_auto_clean
  
  override_dh_auto_configure:
+       PKG_CONFIG_PATH=/opt/lib/pkgconfig \
        ./configure \
 +        --enable-option-checking=fatal \
          --host=$(DEB_HOST_GNU_TYPE) \
          --build=$(DEB_BUILD_GNU_TYPE) \
          --prefix=/usr \
Simple merge
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge