Commit f5f07c97 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner

Merge #3064

Disable building resolver by default

Conflicts:
	configure.ac
parents 598e458c 511912d0
...@@ -898,6 +898,13 @@ if test "$BOOST_NUMERIC_CAST_WOULDFAIL" = "yes" -a X"$werror_ok" = X1 -a $CLANGP ...@@ -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.]) 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 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 use_shared_memory=yes
AC_ARG_WITH(shared-memory, AC_ARG_WITH(shared-memory,
AC_HELP_STRING([--with-shared-memory], AC_HELP_STRING([--with-shared-memory],
......
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 \ SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 d2\ xfrout usermgr zonemgr stats tests $(experimental_resolver) \
dbutil sysinfo memmgr sockcreator dhcp4 dhcp6 d2 dbutil sysinfo memmgr
check-recursive: all-recursive check-recursive: all-recursive
...@@ -83,4 +83,3 @@ b10_resolver_LDFLAGS = -pthread ...@@ -83,4 +83,3 @@ b10_resolver_LDFLAGS = -pthread
# and can't use @datadir@ because doesn't expand default ${prefix} # and can't use @datadir@ because doesn't expand default ${prefix}
b10_resolverdir = $(pkgdatadir) b10_resolverdir = $(pkgdatadir)
b10_resolver_DATA = resolver.spec b10_resolver_DATA = resolver.spec
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 \ SUBDIRS = exceptions util log hooks cryptolink dns cc config acl xfr bench \
asiolink asiodns nsas cache resolve testutils datasrc \ asiolink asiodns nsas cache $(experimental_resolver) testutils \
server_common python dhcp dhcp_ddns dhcpsrv statistics datasrc server_common python dhcp dhcp_ddns dhcpsrv statistics
...@@ -47,4 +47,3 @@ if USE_CLANGPP ...@@ -47,4 +47,3 @@ if USE_CLANGPP
libb10_resolve_la_CXXFLAGS += -Wno-error libb10_resolve_la_CXXFLAGS += -Wno-error
endif endif
libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS) libb10_resolve_la_CPPFLAGS = $(AM_CPPFLAGS)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment