[3079] Don't enter to the makefiles

Do the condition at one level higher.

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index bf6182772ca9a42eacb6a1523def0848cc1bef4d..0b60218cc1cab3ec6b4acf0f0cd565a8763e456d 100644 (file)
--- 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 7c47e6dd138f448f8ebd82d6d3989b014655c098..55c46014aebcb2909002b0dcdbf83ca0381aa93a 100644 (file)
--- 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 7b7d768f4bac09da6c4400969a513b89d667a206..740afb1a514e198d975cc78416affc131a959a20 100644 (file)
--- 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 34e0d732952aae138bde085cbd59fcba3340d71a..55295709dd7032e72bec878c1bda9d7c69fc8967 100644 (file)
--- 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