BIND 10 trac3064, updated. 0eefdc946964638e619c686604c7a275919e2b80 [3064] Disable building the resover without the flag

[BIND 10 source code commits]

The branch, trac3064 has been updated
       via  0eefdc946964638e619c686604c7a275919e2b80 (commit)
      from  2092528ae67cf42002c2aef17140d95cbcab8a54 (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 0eefdc946964638e619c686604c7a275919e2b80
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Aug 13 12:29:17 2013 +0200

    [3064] Disable building the resover without the flag
    
    Don't build the resolver and its libraries (lib/resolve and lib/libnsas)
    in case the --enable-experimental-resolver is not set.

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

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

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index a549e6a..ab38ac6 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -1,3 +1,5 @@
+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
@@ -83,4 +85,4 @@ 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/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index eb8c0c3..9bfdc71 100644
--- a/src/lib/nsas/Makefile.am
+++ b/src/lib/nsas/Makefile.am
@@ -1,3 +1,5 @@
+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
@@ -61,3 +63,4 @@ EXTRA_DIST = nsas_messages.mes
 
 # Make sure that the generated files are got rid of in a clean operation
 CLEANFILES = *.gcno *.gcda nsas_messages.h nsas_messages.cc
+endif
diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index 096a14d..994bc22 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -1,3 +1,5 @@
+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
@@ -47,4 +49,4 @@ if USE_CLANGPP
 libb10_resolve_la_CXXFLAGS += -Wno-error
 endif
 libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
-
+endif