BIND 10 trac2367, updated. bfca7d0247ddd3f518589a7fd6d54841a26f6ba7 [trac2367] don't build the memmgr parts unless is required

[BIND 10 source code commits]

The branch, trac2367 has been updated
       via  bfca7d0247ddd3f518589a7fd6d54841a26f6ba7 (commit)
      from  d6127c5891f381ac5126ae7532bea27a2faf11c7 (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 bfca7d0247ddd3f518589a7fd6d54841a26f6ba7
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Fri Aug 30 06:27:40 2013 -0700

    [trac2367] don't build the memmgr parts unless is required
    
    and not just if shared memory is supported.

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

Summary of changes:
 src/bin/Makefile.am            |   33 ++++++++++++++++++++++++++-------
 src/lib/python/isc/Makefile.am |   17 ++++++++++-------
 2 files changed, 36 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index bb8781e..79c62b9 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -6,6 +6,11 @@ if ENABLE_AUTH
 auth = auth
 # loadzone is used for generating test files for auth
 loadzone = loadzone
+if USE_SHARED_MEMORY
+# Build the memory manager only if we have shared memory.
+# It is useless without it.
+memmgr = memmgr
+endif
 endif
 
 if ENABLE_DDNS
@@ -14,6 +19,11 @@ endif
 
 if ENABLE_LOADZONE
 loadzone = loadzone
+if USE_SHARED_MEMORY
+# Build the memory manager only if we have shared memory.
+# It is useless without it.
+memmgr = memmgr
+endif
 endif
 
 if ENABLE_RESOLVER
@@ -27,25 +37,34 @@ endif
 
 if ENABLE_XFRIN
 xfrin = xfrin
+if USE_SHARED_MEMORY
+# Build the memory manager only if we have shared memory.
+# It is useless without it.
+memmgr = memmgr
+endif
 endif
 
 if ENABLE_XFROUT
 xfrout = xfrout
+if USE_SHARED_MEMORY
+# Build the memory manager only if we have shared memory.
+# It is useless without it.
+memmgr = memmgr
+endif
 endif
 
 if ENABLE_ZONEMGR
 zonemgr = zonemgr
+if USE_SHARED_MEMORY
+# Build the memory manager only if we have shared memory.
+# It is useless without it.
+memmgr = memmgr
+endif
 endif
 
 SUBDIRS = bind10 bindctl cfgmgr $(ddns) $(loadzone) msgq cmdctl \
         $(auth) $(xfrin) \
         $(xfrout) usermgr $(zonemgr) $(stats) tests $(resolver) \
-	sockcreator $(dhcp) dbutil sysinfo
-
-if USE_SHARED_MEMORY
-# Build the memory manager only if we have shared memory.
-# It is useless without it.
-SUBDIRS += memmgr
-endif
+	sockcreator $(dhcp) dbutil sysinfo $(memmgr)
 
 check-recursive: all-recursive
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index de18a94..365bb9f 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/src/lib/python/isc/Makefile.am
@@ -4,6 +4,10 @@ if ENABLE_DNS_LIBRARIES
 acl = acl
 ddns = acl ddns
 datasrc = datasrc
+if USE_SHARED_MEMORY
+# The memory manager is useless without shared memory support
+memmgr = memmgr
+endif
 notify = notify
 server_common = server_common
 xfrin = xfrin
@@ -11,6 +15,10 @@ endif
 
 if ENABLE_XFRIN
 datasrc = datasrc
+if USE_SHARED_MEMORY
+# The memory manager is useless without shared memory support
+memmgr = memmgr
+endif
 notify = notify
 server_common = server_common
 xfrin = xfrin
@@ -21,13 +29,8 @@ acl = acl
 endif
 
 SUBDIRS = util cc config log net testutils bind10 $(datasrc) $(xfrin)
-SUBDIRS += $(acl) $(ddns) $(server_common) $(notify)
-SUBDIRS += log_messages sysinfo
-
-if USE_SHARED_MEMORY
-# The memory manager is useless without shared memory support
-SUBDIRS += memmgr
-endif
+SUBDIRS += $(acl) $(ddns) $(server_common) $(notify) $(memmgr)
+SUBDIRS += log_messages sysinfo 
 
 if ENABLE_LIBDNS
 SUBDIRS += dns