BIND 10 trac2367, updated. 6d8f898441c9ca4690d035e69b084674b680a9d8 [2367]Merge branch 'trac2367' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2367
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 21 18:18:52 UTC 2013
The branch, trac2367 has been updated
via 6d8f898441c9ca4690d035e69b084674b680a9d8 (commit)
via c40ab965259cd218dc4c4b7ff8b6f5c92fefd060 (commit)
from 66fb82af5686c724a982afb4ae86dcf1810e4d53 (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 6d8f898441c9ca4690d035e69b084674b680a9d8
Merge: c40ab96 66fb82a
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Aug 21 13:17:44 2013 -0500
[2367]Merge branch 'trac2367' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2367
merged some conflicts
commit c40ab965259cd218dc4c4b7ff8b6f5c92fefd060
Author: Jeremy C. Reed <jreed at isc.org>
Date: Wed Aug 21 13:15:01 2013 -0500
[2367] add meta "dns" --emable-components feature
This enables various dns components
-----------------------------------------------------------------------
Summary of changes:
m4macros/ax_bind10_components.m4 | 54 ++++++++++++++++++++++++++++++++++++++
src/bin/Makefile.am | 28 ++++++++++++++++++--
src/lib/Makefile.am | 15 ++++++++---
src/lib/python/isc/Makefile.am | 13 +++++++--
4 files changed, 103 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
diff --git a/m4macros/ax_bind10_components.m4 b/m4macros/ax_bind10_components.m4
index 2a654f2..fe576a3 100644
--- a/m4macros/ax_bind10_components.m4
+++ b/m4macros/ax_bind10_components.m4
@@ -50,6 +50,24 @@ if test "x$enable_libdhcp" = "xyes" ; then
components_list="$components_list libdhcp"
fi
+dnl except the experimental
+AC_ARG_ENABLE(dns,
+ AC_HELP_STRING(--enable-dns,Build and install the DNS components),
+ [enable_dns=$enableval], [
+ if test "$components_selection" = "all" -o \
+ "$components_selection" = "reallyall" ; then
+ enable_dns=yes
+ fi
+])
+if test "x$enable_dns" = "xyes" ; then
+ enable_auth=yes
+ enable_libdns=yes
+ enable_ddns=yes
+ enable_xfrin=yes
+ enable_xfrout=yes
+ enable_zonemgr=yes
+fi
+
AC_ARG_ENABLE(resolver,
[AC_HELP_STRING([--enable-experimental-resolver],
[Build and install the experimental resolver [default=no]])],
@@ -65,6 +83,42 @@ if test "x$enable_resolver" = "xyes" ; then
components_list="$components_list resolver"
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"
+fi
+
+AM_CONDITIONAL([ENABLE_DDNS], [test "$enable_ddns" = "yes"])
+AC_SUBST(ENABLE_DDNS)
+if test "x$enable_ddns" = "xyes" ; then
+ components_list="$components_list ddns"
+fi
+
+AM_CONDITIONAL([ENABLE_LIBDNS], [test "$enable_libdns" = "yes"])
+AC_SUBST(ENABLE_LIBDNS)
+if test "x$enable_libdns" = "xyes" ; then
+ components_list="$components_list libdns"
+fi
+
+AM_CONDITIONAL([ENABLE_XFRIN], [test "$enable_xfrin" = "yes"])
+AC_SUBST(ENABLE_XFRIN)
+if test "x$enable_xfrin" = "xyes" ; then
+ components_list="$components_list xfrin"
+fi
+
+AM_CONDITIONAL([ENABLE_XFROUT], [test "$enable_xfrout" = "yes"])
+AC_SUBST(ENABLE_XFROUT)
+if test "x$enable_xfrout" = "xyes" ; then
+ components_list="$components_list xfrout"
+fi
+
+AM_CONDITIONAL([ENABLE_ZONEMGR], [test "$enable_zonemgr" = "yes"])
+AC_SUBST(ENABLE_ZONEMGR)
+if test "x$enable_zonemgr" = "xyes" ; then
+ components_list="$components_list zonemgr"
+fi
+
AC_ARG_ENABLE(statistics,
AC_HELP_STRING(--enable-statistics,Build and install stats components),
[enable_statistics=$enableval], [
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4863a7e..29deec0 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,11 +1,35 @@
-SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
- xfrout usermgr zonemgr tests \
+SUBDIRS = bind10 bindctl cfgmgr loadzone msgq cmdctl \
+ usermgr tests \
sockcreator dbutil sysinfo
if ENABLE_DHCP
SUBDIRS += dhcp4 dhcp6 d2
endif
+if ENABLE_AUTH
+SUBDIRS += auth
+endif
+
+if ENABLE_DDNS
+SUBDIRS += ddns
+endif
+
+if ENABLE_STATISTICS
+SUBDIRS += stats
+endif
+
+if ENABLE_XFRIN
+SUBDIRS += xfrin
+endif
+
+if ENABLE_XFROUT
+SUBDIRS += xfrout
+endif
+
+if ENABLE_ZONEMGR
+SUBDIRS += zonemgr
+endif
+
if ENABLE_RESOLVER
# Build resolver only with --enable-experimental-resolver
SUBDIRS += resolver
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4ddacc6..cc9f10c 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,11 +1,20 @@
-SUBDIRS = exceptions util log hooks cryptolink dns cc config acl xfr bench \
- asiolink asiodns cache testutils \
- datasrc server_common python
+SUBDIRS = exceptions util log hooks cryptolink cc config acl xfr bench \
+ asiolink testutils \
+ server_common python statistics
+
+if ENABLE_LIBDNS
+SUBDIRS += dns asiodns cache datasrc
+endif
if ENABLE_LIBDHCP
SUBDIRS += dhcp dhcp_ddns dhcpsrv
endif
+# xfrout also?
+if ENABLE_XFRIN
+SUBDIRS += xfr
+endif
+
if ENABLE_RESOLVER
SUBDIRS += nsas resolve
endif
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index 9d0a8ce..75c081c 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/src/lib/python/isc/Makefile.am
@@ -1,10 +1,19 @@
-SUBDIRS = datasrc util cc config dns log net notify testutils acl bind10
-SUBDIRS += xfrin log_messages server_common ddns sysinfo statistics
+SUBDIRS = util cc config log net notify testutils acl bind10
+SUBDIRS += log_messages server_common sysinfo statistics
+
if USE_SHARED_MEMORY
# The memory manager is useless without shared memory support
SUBDIRS += memmgr
endif
+if ENABLE_LIBDNS
+SUBDIRS += datasrc dns ddns
+endif
+
+if ENABLE_XFRIN
+SUBDIRS += xfrin
+endif
+
python_PYTHON = __init__.py
pythondir = $(pyexecdir)/isc
More information about the bind10-changes
mailing list