BIND 10 trac2367, updated. 45c244768f696fc74230bec5ed9043e1bc8f9ac1 [trac2367] add --enable-auth option

[BIND 10 source code commits]

The branch, trac2367 has been updated
       via  45c244768f696fc74230bec5ed9043e1bc8f9ac1 (commit)
       via  0e9a7a13bea134121eb8ca33ceecf06a35e12cf6 (commit)
      from  e61abedb8d1545e4a2dcdafda6c334d9c684c071 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 45c244768f696fc74230bec5ed9043e1bc8f9ac1
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu Aug 29 13:24:01 2013 -0400

    [trac2367] add --enable-auth option
    
    and fix some dependencies for ddns and resolver.
    
    TODO: need to use variables for setting new build directories so make
    doesn't repeat.

commit 0e9a7a13bea134121eb8ca33ceecf06a35e12cf6
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu Aug 29 12:02:16 2013 -0500

    [master] resolver doesn't use libb10-xfr.la
    
    Don't LDADD the xfr library for the resolver.
    This was probably just a copy and paste mistake.
    I brought this up on jabber a few days ago.

-----------------------------------------------------------------------

Summary of changes:
 m4macros/ax_bind10_components.m4   |   16 +++++++++++++++-
 src/bin/resolver/Makefile.am       |    1 -
 src/bin/resolver/tests/Makefile.am |    1 -
 src/lib/Makefile.am                |   15 ++++++---------
 src/lib/python/isc/Makefile.am     |    3 ++-
 5 files changed, 23 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/m4macros/ax_bind10_components.m4 b/m4macros/ax_bind10_components.m4
index a0c8f69..6cbe375 100644
--- a/m4macros/ax_bind10_components.m4
+++ b/m4macros/ax_bind10_components.m4
@@ -48,8 +48,19 @@ AM_CONDITIONAL(ENABLE_LIBDHCP, [test "$enable_libdhcp" = "yes"])
 AC_SUBST(ENABLE_LIBDHCP)
 if test "x$enable_libdhcp" = "xyes" ; then
   components_list="$components_list libdhcp"
+  # uses libdns++
+  enable_libdns=yes
 fi
 
+AC_ARG_ENABLE(auth,
+ AC_HELP_STRING(--enable-auth,Build and install the authoritative DNS server),
+  [enable_auth=$enableval], [
+   if test "$components_selection" = "all" -o \
+            "$components_selection" = "reallyall" ; then
+     enable_auth=yes
+   fi
+])
+
 dnl except the experimental
 AC_ARG_ENABLE(dns,
  AC_HELP_STRING(--enable-dns,Build and install the DNS components),
@@ -71,7 +82,7 @@ dnl  enable_dns_libraries is for various server libraries
   enable_zonemgr=yes
 fi
 
-AC_ARG_ENABLE(resolver,
+AC_ARG_ENABLE(experimental-resolver,
   [AC_HELP_STRING([--enable-experimental-resolver],
   [Build and install the experimental resolver [default=no]])],
   [enable_resolver=$enableval], [
@@ -84,12 +95,15 @@ AM_CONDITIONAL([ENABLE_RESOLVER], [test "$enable_resolver" = "yes"])
 AC_SUBST(ENABLE_RESOLVER)
 if test "x$enable_resolver" = "xyes" ; then
   components_list="$components_list resolver"
+  enable_libdns=yes
 fi
 
 AM_CONDITIONAL([ENABLE_AUTH], [test "$enable_auth" = "yes"])
 AC_SUBST(ENABLE_AUTH)
 if test "x$enable_auth" = "xyes" ; then
   components_list="$components_list auth"
+  enable_libdns=yes
+  enable_dns_libraries=yes
 fi
 
 AM_CONDITIONAL([ENABLE_DDNS], [test "$enable_ddns" = "yes"])
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 38f9bf6..30ecd58 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -71,7 +71,6 @@ b10_resolver_LDADD += $(top_builddir)/src/lib/acl/libb10-dnsacl.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
-b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
 b10_resolver_LDADD += $(top_builddir)/src/lib/cache/libb10-cache.la
diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index 52b39a1..8630e0e 100644
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -45,7 +45,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
 run_unittests_LDADD += $(top_builddir)/src/lib/acl/libb10-dnsacl.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
 run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
 run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libb10-resolve.la
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 82b72d1..0390df2 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,21 +6,18 @@ if ENABLE_LIBDNS
 SUBDIRS += dns
 endif
 
-if ENABLE_DNS_LIBRARIES
-SUBDIRS += acl bench asiodns cache datasrc server_common
+if ENABLE_AUTH
+# nsas is used by query_bench
+SUBDIRS += dns acl nsas bench asiodns datasrc server_common xfr
 endif
 
 if ENABLE_LIBDHCP
-SUBDIRS += dhcp dhcp_ddns dhcpsrv
-endif
-
-# xfrout also?
-if ENABLE_XFRIN
-SUBDIRS += xfr
+# asiodns is used by b10-dhcp-ddns
+SUBDIRS += asiodns dhcp dhcp_ddns dhcpsrv
 endif
 
 if ENABLE_RESOLVER
-SUBDIRS += nsas resolve
+SUBDIRS += nsas asiodns acl server_common cache resolve
 endif
 
 if ENABLE_STATISTICS
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index fdb8016..a50a2d1 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/src/lib/python/isc/Makefile.am
@@ -11,7 +11,8 @@ SUBDIRS += dns
 endif
 
 if ENABLE_DNS_LIBRARIES
-SUBDIRS += acl datasrc ddns notify server_common
+# ddns module uses xfrin
+SUBDIRS += acl datasrc xfrin ddns notify server_common
 endif
 
 if ENABLE_STATISTICS