waf: support --without-ad-dc for Heimdal (embedded and system) as well

--without-ad-dc was hardwired to mean --with-system-mitkrb5. With this change
it also possible to build source3/ code and source4/ client side without
building AD DC functionality using Heimdal (embedded or system).

1 files changed, 3 insertions, 3 deletions

diff --git a/wscript b/wscript
index 168e17dcfb..cccd19377b 100755
--- a/wscript
+++ b/wscript
@@ -52,8 +52,8 @@ def set_options(opt):
                    action='callback', callback=system_mitkrb5_callback, dest='with_system_mitkrb5', default=False)
 
     opt.add_option('--without-ad-dc',
-                   help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base). Requires system MIT krb5',
-                   action='store_true', dest='with_system_mitkrb5', default=False)
+                   help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base).',
+                   action='store_true', dest='without_ad_dc', default=False)
 
     gr = opt.option_group('developer options')
     gr.add_option('--enable-build-farm',
@@ -110,7 +110,7 @@ def configure(conf):
 
     if Options.options.with_system_mitkrb5:
         conf.PROCESS_SEPARATE_RULE('system_mitkrb5')
-    else:
+    if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5):
         conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1)
     # Only process heimdal_build for non-MIT KRB5 builds
     # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set