Merge pull request #7871 from omoerbeek/calidns-openbsd

[thirdparty/pdns.git] / pdns / Makefile.am

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 080f0e552f63c59b600ac42fd51c052ed2894429..b29a58686c839ad1cb2612c118c713253933cb83 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -99,9 +99,7 @@ bin_PROGRAMS += \
        ixplore \
        sdig
 
-if HAVE_RECVMMSG
 bin_PROGRAMS += calidns
-endif
 
 if HAVE_BOOST_GE_148
 bin_PROGRAMS += \
@@ -503,6 +501,11 @@ sdig_SOURCES = \
 sdig_LDADD = $(LIBCRYPTO_LIBS)
 sdig_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
 
+if HAVE_LIBCURL
+sdig_SOURCES += minicurl.cc minicurl.hh
+sdig_LDADD += $(LIBCURL)
+endif
+
 calidns_SOURCES = \
        base32.cc \
        base64.cc base64.hh \
@@ -877,7 +880,8 @@ speedtest_SOURCES = \
        sillyrecords.cc \
        speedtest.cc \
        statbag.cc \
-       unix_utility.cc
+       unix_utility.cc \
+       iputils.cc
 
 speedtest_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LDFLAGS)
 speedtest_LDADD = $(LIBCRYPTO_LIBS) \
@@ -1291,6 +1295,7 @@ testrunner_SOURCES = \
        nameserver.cc \
        nsecrecords.cc \
        opensslsigners.cc opensslsigners.hh \
+       pollmplexer.cc \
        qtype.cc \
        rcpgenerator.cc \
        responsestats.cc \
@@ -1316,6 +1321,7 @@ testrunner_SOURCES = \
        test-lock_hh.cc \
        test-lua_auth4_cc.cc \
        test-misc_hh.cc \
+       test-mplexer.cc \
        test-nameserver_cc.cc \
        test-packetcache_cc.cc \
        test-packetcache_hh.cc \
@@ -1360,6 +1366,25 @@ testrunner_SOURCES += decafsigners.cc
 testrunner_LDADD += $(LIBDECAF_LIBS)
 endif
 
+if HAVE_FREEBSD
+ixfrdist_SOURCES += kqueuemplexer.cc
+testrunner_SOURCES += kqueuemplexer.cc
+endif
+
+if HAVE_LINUX
+ixfrdist_SOURCES += epollmplexer.cc
+testrunner_SOURCES += epollmplexer.cc
+endif
+
+if HAVE_SOLARIS
+ixfrdist_SOURCES += \
+       devpollmplexer.cc \
+       portsmplexer.cc
+testrunner_SOURCES += \
+       devpollmplexer.cc \
+       portsmplexer.cc
+endif
+
 pdns_control_SOURCES = \
        arguments.cc \
        dynloader.cc \
@@ -1462,6 +1487,7 @@ fuzz_target_dnsdistcache_SOURCES = \
        dnsname.cc dnsname.hh \
        dnsparser.cc dnsparser.hh \
        dnswriter.cc dnswriter.hh \
+       doh.hh \
        ednsoptions.cc ednsoptions.hh \
        ednssubnet.cc ednssubnet.hh \
        iputils.cc iputils.hh \