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>

diff --git a/wscript b/wscript
index 41ed5dafc9012d4bb96b3b891db03f814b944cc0..ff4bceec7b31a01f00e577209f5c210e0f8ed09a 100644 (file)
--- a/wscript
+++ b/wscript
@@ -136,6 +136,9 @@ def configure(conf):
 
     conf.RECURSE('lib/ldb')
 
 
     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):
     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 65b5e301774d91e6ac6db83348a0f4e86587f127..27dc6750f1415139018a84bc572ccbd15a8b5dfd 100644 (file)
--- 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('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')
 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 fec28bedf684d03c2e942aeae53b1991b7ef242f..9b829d83c098c1b73c124ebdba7a4863bac2336d 100644 (file)
--- a/wscript_build_embedded_heimdal
+++ b/wscript_build_embedded_heimdal
@@ -1,5 +1,4 @@
 import Logs
 
 Logs.info("\tSelected embedded Heimdal build")
 import Logs
 
 Logs.info("\tSelected embedded Heimdal build")

-bld.RECURSE('source4/kdc')

 bld.RECURSE('source4/heimdal_build')
 bld.RECURSE('source4/heimdal_build')

diff --git a/wscript_build_system_heimdal b/wscript_build_system_heimdal
index 8ec09b4783e57ed05b19cb58cddfe7d0725dcf11..4ea8cd7351f65a7333047f74fbc32495dbbab540 100644 (file)
--- a/wscript_build_system_heimdal
+++ b/wscript_build_system_heimdal
@@ -1,5 +1,4 @@
 import Logs
 
 Logs.info("\tSelected system Heimdal build")
 import Logs
 
 Logs.info("\tSelected system Heimdal build")

-bld.RECURSE('source4/kdc')

 bld.RECURSE('source4/heimdal_build')
 bld.RECURSE('source4/heimdal_build')