BIND 10 trac2367, updated. 66fb82af5686c724a982afb4ae86dcf1810e4d53 [trac2367] add --enable-statistics

[BIND 10 source code commits]

The branch, trac2367 has been updated
       via  66fb82af5686c724a982afb4ae86dcf1810e4d53 (commit)
       via  92de1bdc4f67678f6201ba88a5a4b8b05d9fba45 (commit)
      from  b128644f4e6d6af175c93f8fec5e61cf80482f90 (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 66fb82af5686c724a982afb4ae86dcf1810e4d53
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Wed Aug 21 13:59:48 2013 -0400

    [trac2367] add --enable-statistics
    
    also while here, do nsas when resolver is selected

commit 92de1bdc4f67678f6201ba88a5a4b8b05d9fba45
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Wed Aug 21 13:58:57 2013 -0400

    [trac2367] say "Extra" for components in config.report

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

Summary of changes:
 configure.ac                     |    2 +-
 m4macros/ax_bind10_components.m4 |   14 ++++++++++++++
 src/bin/Makefile.am              |    6 +++++-
 src/lib/Makefile.am              |   10 +++++++---
 4 files changed, 27 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 6a36bff..3908526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1564,7 +1564,7 @@ END
 fi
 
 echo >> config.report
-echo Components: >> config.report
+echo Extra Components: >> config.report
 for i in $components_list; do
   echo "  $i"
 done >> config.report
diff --git a/m4macros/ax_bind10_components.m4 b/m4macros/ax_bind10_components.m4
index b581d35..2a654f2 100644
--- a/m4macros/ax_bind10_components.m4
+++ b/m4macros/ax_bind10_components.m4
@@ -65,4 +65,18 @@ if test "x$enable_resolver" = "xyes" ; then
   components_list="$components_list resolver"
 fi
 
+AC_ARG_ENABLE(statistics,
+ AC_HELP_STRING(--enable-statistics,Build and install stats components),
+  [enable_statistics=$enableval], [
+   if test "$components_selection" = "all" -o \
+            "$components_selection" = "reallyall" ; then
+     enable_statistics=yes
+   fi
+])
+AM_CONDITIONAL(ENABLE_STATISTICS, [test "$enable_statistics" = "yes"])
+AC_SUBST(ENABLE_STATISTICS)
+if test "x$enable_statistics" = "xyes" ; then
+  components_list="$components_list statistics"
+fi
+
 ])dnl AX_BIND10_COMPONENTS
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 104dc8b..4863a7e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
-	xfrout usermgr zonemgr stats tests \
+	xfrout usermgr zonemgr tests \
 	sockcreator dbutil sysinfo
 
 if ENABLE_DHCP
@@ -11,6 +11,10 @@ if ENABLE_RESOLVER
 SUBDIRS += resolver
 endif
 
+if ENABLE_STATISTICS
+SUBDIRS += stats
+endif
+
 if USE_SHARED_MEMORY
 # Build the memory manager only if we have shared memory.
 # It is useless without it.
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6e4fb11..4ddacc6 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,11 +1,15 @@
 SUBDIRS = exceptions util log hooks cryptolink dns cc config acl xfr bench \
-          asiolink asiodns nsas cache testutils \
-          datasrc server_common python statistics
+          asiolink asiodns cache testutils \
+          datasrc server_common python
 
 if ENABLE_LIBDHCP
 SUBDIRS += dhcp dhcp_ddns dhcpsrv
 endif
 
 if ENABLE_RESOLVER
-SUBDIRS += resolve
+SUBDIRS += nsas resolve
+endif
+
+if ENABLE_STATISTICS
+SUBDIRS += statistics
 endif