Merge #3079

Conflicts:
	src/bin/Makefile.am

src/bin/Makefile.am

@@ -5,6 +5,12 @@ endif
 
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
 	xfrout usermgr zonemgr stats tests $(experimental_resolver) \
-	sockcreator dhcp4 dhcp6 d2 dbutil sysinfo memmgr
+	sockcreator dhcp4 dhcp6 d2 dbutil sysinfo
+
+if USE_SHARED_MEMORY
+# Build the memory manager only if we have shared memory.
+# It is useless without it.
+SUBDIRS += memmgr
+endif
 
 check-recursive: all-recursive

src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc

@@ -143,6 +143,7 @@ INSTANTIATE_TEST_CASE_P(LocalSegment, ZoneDataUpdaterTest,
                         ::testing::Values(static_cast<SegmentCreator*>(
                             &memory_segment_creator)));
 
+#ifdef USE_SHARED_MEMORY
 class MappedSegmentCreator : public SegmentCreator {
 public:
     MappedSegmentCreator(size_t initial_size =
@@ -162,7 +163,6 @@ private:
     const size_t initial_size_;
 };
 
-#ifdef USE_SHARED_MEMORY
 // There should be no initialization fiasco there. We only set int value inside
 // and don't use it until the create() is called.
 MappedSegmentCreator small_creator(4092), default_creator;

src/lib/python/isc/Makefile.am

@@ -1,5 +1,9 @@
 SUBDIRS = datasrc util cc config dns log net notify testutils acl bind10
-SUBDIRS += xfrin log_messages server_common ddns sysinfo statistics memmgr
+SUBDIRS += xfrin log_messages server_common ddns sysinfo statistics
+if USE_SHARED_MEMORY
+# The memory manager is useless without shared memory support
+SUBDIRS += memmgr
+endif
 
 python_PYTHON = __init__.py