Browse Source

Merge #3064

Disable building resolver by default

Conflicts:
	configure.ac
Michal 'vorner' Vaner 11 years ago
parent
commit
f5f07c976d
5 changed files with 21 additions and 6 deletions
  1. 7 0
      configure.ac
  2. 7 2
      src/bin/Makefile.am
  3. 0 1
      src/bin/resolver/Makefile.am
  4. 7 2
      src/lib/Makefile.am
  5. 0 1
      src/lib/resolve/Makefile.am

+ 7 - 0
configure.ac

@@ -898,6 +898,13 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP
     AC_MSG_ERROR([Failed to compile a required header file.  If you are using FreeBSD and Boost installed via ports, retry with specifying --without-werror.  See the ChangeLog entry for Trac no. 1991 for more details.])
 fi
 
+build_experimental_resolver=no
+AC_ARG_ENABLE(experimental_resolver,
+  [AC_HELP_STRING([--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"])
+
 use_shared_memory=yes
 AC_ARG_WITH(shared-memory,
     AC_HELP_STRING([--with-shared-memory],

+ 7 - 2
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

+ 0 - 1
src/bin/resolver/Makefile.am

@@ -83,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
-

+ 7 - 2
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

+ 0 - 1
src/lib/resolve/Makefile.am

@@ -47,4 +47,3 @@ if USE_CLANGPP
 libb10_resolve_la_CXXFLAGS += -Wno-error
 endif
 libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
-