BIND 10 trac2367, updated. e61abedb8d1545e4a2dcdafda6c334d9c684c071 [trac2367] split out some more components
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Aug 22 02:09:03 UTC 2013
The branch, trac2367 has been updated
via e61abedb8d1545e4a2dcdafda6c334d9c684c071 (commit)
via d25bf671404a67cd1f0edfb1a98785f155b3be68 (commit)
from 6d8f898441c9ca4690d035e69b084674b680a9d8 (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 e61abedb8d1545e4a2dcdafda6c334d9c684c071
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Aug 21 22:08:11 2013 -0400
[trac2367] split out some more components
dns_libraries component, loadzone
notify library
some cfgmgr plugins
and some tools
commit d25bf671404a67cd1f0edfb1a98785f155b3be68
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Aug 21 21:55:59 2013 -0400
[trac2367] don't need to run b10-stats by default
Committing this now, but could make it build time configurable.
To discuss later.
TODO: make sure this is documented how to start b10-stats.
-----------------------------------------------------------------------
Summary of changes:
m4macros/ax_bind10_components.m4 | 15 +++++++++++++++
src/bin/Makefile.am | 6 +++++-
src/bin/bind10/init.spec | 1 -
src/bin/cfgmgr/plugins/Makefile.am | 14 +++++++++++---
src/bin/cfgmgr/plugins/tests/Makefile.am | 6 +++++-
src/lib/Makefile.am | 10 +++++++---
src/lib/python/isc/Makefile.am | 14 +++++++++++---
tests/tools/Makefile.am | 10 +++++++++-
8 files changed, 63 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
diff --git a/m4macros/ax_bind10_components.m4 b/m4macros/ax_bind10_components.m4
index fe576a3..a0c8f69 100644
--- a/m4macros/ax_bind10_components.m4
+++ b/m4macros/ax_bind10_components.m4
@@ -62,7 +62,10 @@ AC_ARG_ENABLE(dns,
if test "x$enable_dns" = "xyes" ; then
enable_auth=yes
enable_libdns=yes
+dnl enable_dns_libraries is for various server libraries
+ enable_dns_libraries=yes
enable_ddns=yes
+ enable_loadzone=yes
enable_xfrin=yes
enable_xfrout=yes
enable_zonemgr=yes
@@ -101,6 +104,18 @@ if test "x$enable_libdns" = "xyes" ; then
components_list="$components_list libdns"
fi
+AM_CONDITIONAL([ENABLE_DNS_LIBRARIES], [test "$enable_dns_libraries" = "yes"])
+AC_SUBST(ENABLE_DNS_LIBRARIES)
+if test "x$enable_dns_libraries" = "xyes" ; then
+ components_list="$components_list dns_libraries"
+fi
+
+AM_CONDITIONAL([ENABLE_LOADZONE], [test "$enable_loadzone" = "yes"])
+AC_SUBST(ENABLE_LOADZONE)
+if test "x$enable_loadzone" = "xyes" ; then
+ components_list="$components_list loadzone"
+fi
+
AM_CONDITIONAL([ENABLE_XFRIN], [test "$enable_xfrin" = "yes"])
AC_SUBST(ENABLE_XFRIN)
if test "x$enable_xfrin" = "xyes" ; then
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 29deec0..f46a62f 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bind10 bindctl cfgmgr loadzone msgq cmdctl \
+SUBDIRS = bind10 bindctl cfgmgr msgq cmdctl \
usermgr tests \
sockcreator dbutil sysinfo
@@ -14,6 +14,10 @@ if ENABLE_DDNS
SUBDIRS += ddns
endif
+if ENABLE_LOADZONE
+SUBDIRS += loadzone
+endif
+
if ENABLE_STATISTICS
SUBDIRS += stats
endif
diff --git a/src/bin/bind10/init.spec b/src/bin/bind10/init.spec
index 62c6f09..384effb 100644
--- a/src/bin/bind10/init.spec
+++ b/src/bin/bind10/init.spec
@@ -8,7 +8,6 @@
"item_type": "named_set",
"item_optional": false,
"item_default": {
- "b10-stats": { "address": "Stats", "kind": "dispensable" },
"b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
},
"named_set_item_spec": {
diff --git a/src/bin/cfgmgr/plugins/Makefile.am b/src/bin/cfgmgr/plugins/Makefile.am
index 5967abd..efab48f 100644
--- a/src/bin/cfgmgr/plugins/Makefile.am
+++ b/src/bin/cfgmgr/plugins/Makefile.am
@@ -2,13 +2,21 @@ SUBDIRS = tests
EXTRA_DIST = README logging.spec tsig_keys.spec
+config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
+config_plugin_DATA = logging.spec
+
+python_PYTHON = b10logging.py
+
+if ENABLE_AUTH
datasrc.spec: datasrc.spec.pre
$(SED) -e "s|@@STATIC_ZONE_FILE@@|$(pkgdatadir)/static.zone|;s|@@SQLITE3_DATABASE_FILE@@|$(localstatedir)/$(PACKAGE)/zone.sqlite3|" datasrc.spec.pre >$@
-config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
-config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
+config_plugin_DATA += tsig_keys.spec datasrc.spec
+
+python_PYTHON += tsig_keys.py datasrc_config_plugin.py
+
+endif
-python_PYTHON = b10logging.py tsig_keys.py datasrc_config_plugin.py
pythondir = $(config_plugindir)
CLEANFILES = b10logging.pyc tsig_keys.pyc datasrc.spec
diff --git a/src/bin/cfgmgr/plugins/tests/Makefile.am b/src/bin/cfgmgr/plugins/tests/Makefile.am
index 978dc4b..02dac0c 100644
--- a/src/bin/cfgmgr/plugins/tests/Makefile.am
+++ b/src/bin/cfgmgr/plugins/tests/Makefile.am
@@ -1,5 +1,9 @@
PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
-PYTESTS = tsig_keys_test.py logging_test.py datasrc_test.py
+PYTESTS = logging_test.py
+
+if ENABLE_DNS_LIBRARIES
+PYTESTS += tsig_keys_test.py datasrc_test.py
+endif
EXTRA_DIST = $(PYTESTS)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index cc9f10c..82b72d1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,9 +1,13 @@
-SUBDIRS = exceptions util log hooks cryptolink cc config acl xfr bench \
+SUBDIRS = exceptions util log hooks cryptolink cc config \
asiolink testutils \
- server_common python statistics
+ python statistics
if ENABLE_LIBDNS
-SUBDIRS += dns asiodns cache datasrc
+SUBDIRS += dns
+endif
+
+if ENABLE_DNS_LIBRARIES
+SUBDIRS += acl bench asiodns cache datasrc server_common
endif
if ENABLE_LIBDHCP
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index 75c081c..fdb8016 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/src/lib/python/isc/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = util cc config log net notify testutils acl bind10
-SUBDIRS += log_messages server_common sysinfo statistics
+SUBDIRS = util cc config log net testutils bind10
+SUBDIRS += log_messages sysinfo
if USE_SHARED_MEMORY
# The memory manager is useless without shared memory support
@@ -7,7 +7,15 @@ SUBDIRS += memmgr
endif
if ENABLE_LIBDNS
-SUBDIRS += datasrc dns ddns
+SUBDIRS += dns
+endif
+
+if ENABLE_DNS_LIBRARIES
+SUBDIRS += acl datasrc ddns notify server_common
+endif
+
+if ENABLE_STATISTICS
+SUBDIRS += statistics
endif
if ENABLE_XFRIN
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index ac10c40..c495c4c 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1 +1,9 @@
-SUBDIRS = badpacket perfdhcp
+SUBDIRS =
+
+if ENABLE_DHCP
+SUBDIRS += perfdhcp
+endif
+
+if ENABLE_LIBDNS
+SUBDIRS += badpacket
+endif
More information about the bind10-changes
mailing list