From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Tue, 13 Aug 2013 13:28:19 +0000 (+0200)
Subject: [3079] Don't enter to the makefiles
X-Git-Tag: bind10-1.2.0beta1-release~276^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed7586fa45a5aac074e8f38a01e8ff5a48ffefaa;p=thirdparty%2Fkea.git

[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 bf6182772c..0b60218cc1 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 7c47e6dd13..55c46014ae 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 7b7d768f4b..740afb1a51 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 34e0d73295..55295709dd 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