From 2ddf89a2bc3c00b71dec230f071416e594f89113 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 21 May 2012 12:45:12 +0300 Subject: Introduce system MIT krb5 build with --with-system-mitkrb5 option. System MIT krb5 build also enabled by specifying --without-ad-dc When --with-system-mitkrb5 (or --withou-ad-dc) option is passed to top level configure in WAF build we are trying to detect and use system-wide MIT krb5 libraries. As result, Samba 4 DC functionality will be disabled due to the fact that it is currently impossible to implement embedded KDC server with MIT krb5. Thus, --with-system-mitkrb5/--without-ad-dc build will only produce * Samba 4 client libraries and their Python bindings * Samba 3 server (smbd, nmbd, winbindd from source3/) * Samba 3 client libraries In addition, Samba 4 DC server-specific tests will not be compiled into smbtorture. This in particular affects spoolss_win, spoolss_notify, and remote_pac rpc tests. --- wscript | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 15ac7f57c7..26a5c8611c 100755 --- a/wscript +++ b/wscript @@ -32,6 +32,14 @@ def set_options(opt): opt.RECURSE('source3') opt.RECURSE('lib/util') + opt.add_option('--with-system-mitkrb5', + help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base)', + action='store_true', 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) + gr = opt.option_group('developer options') gr.add_option('--enable-build-farm', help='enable special build farm options', @@ -84,8 +92,11 @@ def configure(conf): conf.RECURSE('dynconfig') conf.RECURSE('lib/ldb') - if Options.options.with_mit_krb5_checks: - conf.PROCESS_SEPARATE_RULE('krb5') + + if Options.options.with_system_mitkrb5: + conf.PROCESS_SEPARATE_RULE('system_mitkrb5') + else: + 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 # to the lowcased output of 'krb5-config --vendor'. -- cgit