BIND 10 trac3079, updated. ed7586fa45a5aac074e8f38a01e8ff5a48ffefaa [3079] Don't enter to the makefiles

[BIND 10 source code commits]

The branch, trac3079 has been updated
       via  ed7586fa45a5aac074e8f38a01e8ff5a48ffefaa (commit)
      from  806ec4bfdf1561f4e59c67550363caf10c41e10e (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 ed7586fa45a5aac074e8f38a01e8ff5a48ffefaa
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Aug 13 15:28:19 2013 +0200

    [3079] Don't enter to the makefiles
    
    Do the condition at one level higher.

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

Summary of changes:
 src/bin/Makefile.am                   |    8 +++++++-
 src/bin/memmgr/Makefile.am            |    7 -------
 src/lib/python/isc/Makefile.am        |    6 +++++-
 src/lib/python/isc/memmgr/Makefile.am |    7 -------
 4 files changed, 12 insertions(+), 16 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index bf61827..0b60218 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,5 +1,11 @@
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
 	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 d2\
-	dbutil sysinfo memmgr
+	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/bin/memmgr/Makefile.am b/src/bin/memmgr/Makefile.am
index 7c47e6d..55c4601 100644
--- a/src/bin/memmgr/Makefile.am
+++ b/src/bin/memmgr/Makefile.am
@@ -1,8 +1,3 @@
-if USE_SHARED_MEMORY
-
-# If we don't have shared memory, the memory manager is useless.
-# Skip building, testing and installing it completely.
-
 SUBDIRS = . tests
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -65,5 +60,3 @@ install-data-hook:
 
 clean-local:
 	rm -rf $(CLEANDIRS)
-
-endif
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index 7b7d768..740afb1 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 statistic
+if USE_SHARED_MEMORY
+# The memory manager is useless without shared memory support
+SUBDIRS += memmgr
+endif
 
 python_PYTHON = __init__.py
 
diff --git a/src/lib/python/isc/memmgr/Makefile.am b/src/lib/python/isc/memmgr/Makefile.am
index 34e0d73..5529570 100644
--- a/src/lib/python/isc/memmgr/Makefile.am
+++ b/src/lib/python/isc/memmgr/Makefile.am
@@ -1,8 +1,3 @@
-if USE_SHARED_MEMORY
-
-# We use the memory manager only with shared memory. No reason to
-# install on platforms without it and tests may fail there.
-
 SUBDIRS = . tests
 
 python_PYTHON = __init__.py builder.py datasrc_info.py logger.py
@@ -28,5 +23,3 @@ CLEANDIRS = __pycache__
 
 clean-local:
 	rm -rf $(CLEANDIRS)
-
-endif