Commit 544668f9 authored by Mukund Sivaraman's avatar Mukund Sivaraman

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

parent d07c725e
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
if BUILD_EXPERIMENTAL_RESOLVER
# Build the resolver only with --enable-experimental-resolver
SUBDIRS = . tests bench SUBDIRS = . tests bench
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
...@@ -85,4 +83,3 @@ b10_resolver_LDFLAGS = -pthread ...@@ -85,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
endif
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
if BUILD_EXPERIMENTAL_RESOLVER
# Build resolver only with --enable-experimental-resolver
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
...@@ -49,4 +47,3 @@ if USE_CLANGPP ...@@ -49,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)
endif
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