BIND 10 trac3064, updated. 69024d03d0cebda395388fdcec2ad559c093f8aa [3064] AC_DEFINE is unnecessary as it's used in Makefiles only

[BIND 10 source code commits]

The branch, trac3064 has been updated
       via  69024d03d0cebda395388fdcec2ad559c093f8aa (commit)
       via  544668f9aac4823519cee2b10b52315c0df4c259 (commit)
      from  d07c725e9a441e363a18e66965ff7e76f4de526e (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 69024d03d0cebda395388fdcec2ad559c093f8aa
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Aug 13 17:56:10 2013 +0530

    [3064] AC_DEFINE is unnecessary as it's used in Makefiles only

commit 544668f9aac4823519cee2b10b52315c0df4c259
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Aug 13 17:52:22 2013 +0530

    [3064] Don't even enter resolver directories if experimental resolver is disabled

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

Summary of changes:
 configure.ac                 |    3 ---
 src/bin/Makefile.am          |    9 +++++++--
 src/bin/resolver/Makefile.am |    3 ---
 src/lib/Makefile.am          |    9 +++++++--
 src/lib/resolve/Makefile.am  |    3 ---
 5 files changed, 14 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 677a1e6..827a133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -904,9 +904,6 @@ AC_ARG_ENABLE(experimental_resolver,
   [enable building of the experimental resolver [default=no]])],
   build_experimental_resolver=$enableval, build_experimental_resolver=no)
 AM_CONDITIONAL([BUILD_EXPERIMENTAL_RESOLVER], [test "$build_experimental_resolver" = "yes"])
-if test "$build_experimental_resolver" = "yes" ; then
-    AC_DEFINE(BUILD_EXPERIMENTAL_RESOLVER, 1, [Define to 1 to build the resolver])
-fi
 AC_SUBST(BUILD_EXPERIMENTAL_RESOLVER)
 
 use_shared_memory=yes
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index bf61827..621558e 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,10 @@
+if BUILD_EXPERIMENTAL_RESOLVER
+# Build resolver only with --enable-experimental-resolver
+experimental_resolver = resolver
+endif
+
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
-	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 d2\
-	dbutil sysinfo memmgr
+	xfrout usermgr zonemgr stats tests $(experimental_resolver) \
+	sockcreator dhcp4 dhcp6 d2 dbutil sysinfo memmgr
 
 check-recursive: all-recursive
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index ab38ac6..38f9bf6 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -1,5 +1,3 @@
-if BUILD_EXPERIMENTAL_RESOLVER
-# Build the resolver only with --enable-experimental-resolver
 SUBDIRS = . tests bench
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
@@ -85,4 +83,3 @@ b10_resolver_LDFLAGS = -pthread
 # and can't use @datadir@ because doesn't expand default ${prefix}
 b10_resolverdir = $(pkgdatadir)
 b10_resolver_DATA = resolver.spec
-endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ddf369d..59cb8e1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,3 +1,8 @@
+if BUILD_EXPERIMENTAL_RESOLVER
+# Build resolver only with --enable-experimental-resolver
+experimental_resolver = resolve
+endif
+
 SUBDIRS = exceptions util log hooks cryptolink dns cc config acl xfr bench \
-          asiolink asiodns nsas cache resolve testutils datasrc \
-          server_common python dhcp dhcp_ddns dhcpsrv statistics
+          asiolink asiodns nsas cache $(experimental_resolver) testutils \
+          datasrc server_common python dhcp dhcp_ddns dhcpsrv statistics
diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index 994bc22..0016684 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -1,5 +1,3 @@
-if BUILD_EXPERIMENTAL_RESOLVER
-# Build resolver only with --enable-experimental-resolver
 SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
@@ -49,4 +47,3 @@ if USE_CLANGPP
 libb10_resolve_la_CXXFLAGS += -Wno-error
 endif
 libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
-endif