]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #4990 from rgacogne/rec-snmp-clean
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 21 Feb 2017 08:58:24 +0000 (09:58 +0100)
committerGitHub <noreply@github.com>
Tue, 21 Feb 2017 08:58:24 +0000 (09:58 +0100)
rec: Add SNMP support

1  2 
docs/markdown/recursor/scripting.md
docs/markdown/recursor/settings.md
pdns/lua-recursor4.cc
pdns/pdns_recursor.cc
pdns/recursordist/Makefile.am
pdns/recursordist/configure.ac

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1298d9aeab04dcb13944ae6c245af77215cc0b82,7a0be912965b83cf77991d70d82c316a9faae583..e79af91b8cb716fd66aef3ab3e2b240d2b820dac
@@@ -112,8 -112,9 +112,10 @@@ PDNS_CHECK_LIBCRYPTO(
    ]
  )
  PDNS_CHECK_LIBCRYPTO_ECDSA
 +PDNS_CHECK_LIBSODIUM
  
+ PDNS_WITH_NET_SNMP
  # check for tools we might need
  PDNS_CHECK_RAGEL
  PDNS_CHECK_CURL