BIND 10 master, updated. 95e7d858ada42f6180d677d176b79b3b91219376 Merge #3079

[BIND 10 source code commits]

The branch, master has been updated
       via  95e7d858ada42f6180d677d176b79b3b91219376 (commit)
       via  72077a1d5b36a470ee5c16599171a2d7cac11ac3 (commit)
       via  278c59a0b5db80c61ed08550da6d065af8aead90 (commit)
       via  ed7586fa45a5aac074e8f38a01e8ff5a48ffefaa (commit)
       via  806ec4bfdf1561f4e59c67550363caf10c41e10e (commit)
      from  d581f79243723a01240da4b7b5adb8028d016e76 (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 95e7d858ada42f6180d677d176b79b3b91219376
Merge: d581f79 72077a1
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Aug 14 14:04:51 2013 +0200

    Merge #3079
    
    Conflicts:
    	src/bin/Makefile.am

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

Summary of changes:
 src/bin/Makefile.am                                |    8 +++++++-
 .../tests/memory/zone_data_updater_unittest.cc     |    2 +-
 src/lib/python/isc/Makefile.am                     |    6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 621558e..ea2f1b2 100644
--- a/src/bin/Makefile.am
+++ b/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
diff --git a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
index f3e814a..d4918fa 100644
--- a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
+++ b/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;
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index 7b7d768..9d0a8ce 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/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