From: David Mulder Date: Thu, 8 Aug 2024 20:06:22 +0000 (-0600) Subject: Introduce build option to enable Himmelblau X-Git-Tag: tdb-1.4.13~902 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58fbba389741f6de3d900915781b15287c656797;p=thirdparty%2Fsamba.git Introduce build option to enable Himmelblau The build for Himmelblau will be disabled by default. Signed-off-by: David Mulder Reviewed-by: Alexander Bokovoy --- diff --git a/rust/wscript_build b/rust/wscript_build index f9528e57a52..abca867f947 100644 --- 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 d059caec471..fefefb5e36c 100755 --- 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 62e5107f00d..c4387fe737f 100644 --- 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'