summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2015-07-23 13:48:50 +0200
committerAndrew Bartlett <abartlet@samba.org>2016-03-17 04:32:28 +0100
commit7feb650a372094f2ecfa82e41756d5e2fa92ff9a (patch)
treec6e777111aea9338aa8f26cadaa6a024c31f625e
parent4865867f59140a65d498255a64564f9e47810323 (diff)
downloadsamba-7feb650a372094f2ecfa82e41756d5e2fa92ff9a.tar.gz
wscript: Build the KDC code if we have the AD DC build enabled
Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Sumit Bose <sbose@redhat.com> Reviewed-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--wscript3
-rw-r--r--wscript_build1
-rw-r--r--wscript_build_embedded_heimdal1
-rw-r--r--wscript_build_system_heimdal1
4 files changed, 4 insertions, 2 deletions
diff --git a/wscript b/wscript
index 41ed5dafc90..ff4bceec7b3 100644
--- a/wscript
+++ b/wscript
@@ -136,6 +136,9 @@ def configure(conf):
conf.RECURSE('lib/ldb')
+ if not (Options.options.without_ad_dc):
+ conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
+
if Options.options.with_system_mitkrb5:
conf.PROCESS_SEPARATE_RULE('system_mitkrb5')
if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5):
diff --git a/wscript_build b/wscript_build
index 65b5e301774..27dc6750f14 100644
--- a/wscript_build
+++ b/wscript_build
@@ -138,6 +138,7 @@ else:
bld.RECURSE('libcli/smbreadline')
if bld.AD_DC_BUILD_IS_ENABLED():
bld.RECURSE('source4/setup')
+ bld.RECURSE('source4/kdc')
if bld.env.with_ctdb:
bld.RECURSE('ctdb')
bld.RECURSE('source4/scripting')
diff --git a/wscript_build_embedded_heimdal b/wscript_build_embedded_heimdal
index fec28bedf68..9b829d83c09 100644
--- a/wscript_build_embedded_heimdal
+++ b/wscript_build_embedded_heimdal
@@ -1,5 +1,4 @@
import Logs
Logs.info("\tSelected embedded Heimdal build")
-bld.RECURSE('source4/kdc')
bld.RECURSE('source4/heimdal_build')
diff --git a/wscript_build_system_heimdal b/wscript_build_system_heimdal
index 8ec09b4783e..4ea8cd7351f 100644
--- a/wscript_build_system_heimdal
+++ b/wscript_build_system_heimdal
@@ -1,5 +1,4 @@
import Logs
Logs.info("\tSelected system Heimdal build")
-bld.RECURSE('source4/kdc')
bld.RECURSE('source4/heimdal_build')