drop --enable-recursor; add --enable-tools, preparing for core/tools packaging split...

diff --git a/configure.ac b/configure.ac
index 32e4c85bd681811da8916624d3514b366fba9766..c98d974fd03ea4172763a35d8f196a2e389bb1aa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -327,14 +327,14 @@ AC_ARG_ENABLE(gcc-skip-locking,
        AC_DEFINE(GCC_SKIP_LOCKING,,[Skip gcc locking]),
  )
 
-AC_MSG_CHECKING(whether we will be building the recursor)
-AC_ARG_ENABLE(recursor,
- AC_HELP_STRING([--enable-recursor],[if we should build the recursor]),
-       enable_recursor=$enableval,
-       enable_recursor=no )
-
-AC_MSG_RESULT($enable_recursor)
-AM_CONDITIONAL(RECURSOR,test x"$enable_recursor" = "xyes")
+AC_MSG_CHECKING(whether we will be building and installing the extra tools)
+AC_ARG_ENABLE(tools,
+ AC_HELP_STRING([--enable-tools],[if we should build+install the tools]),
+       enable_tools=$enableval,
+       enable_tools=no )
+
+AC_MSG_RESULT($enable_tools)
+AM_CONDITIONAL(TOOLS,test x"$enable_tools" = "xyes")
 
 for a in $modules $dynmodules
 do

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 5154f0847a6305f705a6a1b1448197bef7e56f0d..69f8b16f09089d7e55c9348767871a1afa34d31a 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -31,16 +31,15 @@ BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h version_generated.h
 noinst_SCRIPTS = pdns
 sysconf_DATA = pdns.conf-dist 
 
-if RECURSOR
-sbin_PROGRAMS = pdns_server pdns_recursor
-bin_PROGRAMS = pdns_control rec_control pdnssec dnsreplay
-else
 sbin_PROGRAMS = pdns_server 
-bin_PROGRAMS = pdns_control pdnssec dnsreplay
+bin_PROGRAMS = pdns_control pdnssec
+
+if TOOLS
+  bin_PROGRAMS += dnsbulktest dnsreplay dnsscan dnsscope dnstcpbench dnswasher nproxy nsec3dig
 endif
 
-EXTRA_PROGRAMS=pdns_recursor sdig dnstcpbench tsig-tests speedtest pdns_control dnsscope dnsgram \
-testrunner \
+EXTRA_PROGRAMS=pdns_recursor sdig dnstcpbench tsig-tests speedtest rec_control dnsscope dnsgram \
+testrunner dnsreplay \
 toysdig dnsdemog dnswasher dnsscan nproxy notify pdnssec dnsbulktest nsec3dig # dnslabel # tcptorture
 
 pdns_server_SOURCES=dnspacket.cc nameserver.cc tcpreceiver.hh \