BIND 10 master, updated. bce439d0e7c18c147f3f675c03e40ecbd92fc65f [master] Revert "[master] excluded DHCP related stuff from Makefile's"

[BIND 10 source code commits]

The branch, master has been updated
       via  bce439d0e7c18c147f3f675c03e40ecbd92fc65f (commit)
      from  f37c712d3dc978323e629d9ee4e982f1ae7570ec (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 bce439d0e7c18c147f3f675c03e40ecbd92fc65f
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon May 14 18:18:43 2012 +0200

    [master] Revert "[master] excluded DHCP related stuff from Makefile's"
    
    This reverts commit 0960094a732dde31e21013c2f2ada3c2077eaf6e.

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

Summary of changes:
 src/bin/Makefile.am |    3 +--
 src/lib/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 4f602a9..499e209 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,4 @@
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \
-        xfrout usermgr zonemgr stats tests resolver sockcreator dbutil
-#	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 dbutil
+	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 dbutil
 
 check-recursive: all-recursive
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 499a71a..9ebd541 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,3 @@
 SUBDIRS = exceptions util log cryptolink dns cc config acl xfr bench \
           asiolink asiodns nsas cache resolve testutils datasrc \
-          server_common python statistics
-#          server_common python dhcp statistics
+          server_common python dhcp statistics