Introduce build option to enable Himmelblau

The build for Himmelblau will be disabled by
default.

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/rust/wscript_build b/rust/wscript_build
index f9528e57a52b102f362658a0d1b22e0dd84cc731..abca867f9473c3612614dd09823d5fd6fecd5866 100644 (file)
--- a/rust/wscript_build
+++ b/rust/wscript_build
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
-bld.RECURSE('himmelblaud')
-bld.RECURSE('nss')
-bld.RECURSE('pam')
+if conf.env.enable_himmelblau:
+    bld.RECURSE('himmelblaud')
+    bld.RECURSE('nss')
+    bld.RECURSE('pam')

diff --git a/script/autobuild.py b/script/autobuild.py
index d059caec4711e26d9e586f07ff3fde9e18da49e2..fefefb5e36ce2a988d1e6706984fdbb658526e62 100755 (executable)
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -313,7 +313,7 @@ tasks = {
     "samba": {
         "sequence": [
             ("random-sleep", random_sleep(300, 900)),
-            ("configure", "./configure.developer" + samba_configure_params),
+            ("configure", "./configure.developer --with-himmelblau" + samba_configure_params),
             ("make", "make -j"),
             ("test", make_test(exclude_envs=[
             "none",

diff --git a/wscript b/wscript
index 62e5107f00dd102f35aa35431ec9e918e8e21253..c4387fe737fcd3290c1eeede72292d0e28e6e992 100644 (file)
--- a/wscript
+++ b/wscript
@@ -168,6 +168,10 @@ def options(opt):
                    dest='SAMBA_VERSION_VENDOR_SUFFIX',
                    default=None)
 
+    opt.add_option('--with-himmelblau', default=False,
+                  help=('Build with Azure Entra ID support.'),
+                  action='store_true', dest='enable_himmelblau')
+
 
 def configure(conf):
     if Options.options.SAMBA_VERSION_VENDOR_SUFFIX:
@@ -506,6 +510,7 @@ def configure(conf):
 
     conf.env.debug = Options.options.debug
     conf.env.developer = Options.options.developer
+    conf.env.enable_himmelblau = Options.options.enable_himmelblau
 
     #
     # FreeBSD is broken. It doesn't include 'extern char **environ'