1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

build: Consolidate --with-ntvfs-fileserver into --enable-selftest when building the AD DC

This removes from our configure help a feature which we retain only
to support our selftest system.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Andrew Bartlett 2021-03-25 10:46:49 +13:00 committed by Jeremy Allison
parent 7415f712db
commit ef8623c1d6

21
wscript
View File

@ -99,14 +99,6 @@ def options(opt):
help='disable AD DC functionality (enables only Samba FS (File Server, Winbind, NMBD) and client utilities.',
action='store_true', dest='without_ad_dc', default=False)
opt.add_option('--with-ntvfs-fileserver',
help='enable the deprecated NTVFS file server from the original Samba4 branch (default if --enable-selftest specified). Conflicts with --with-system-mitkrb5 and --without-ad-dc',
action='store_true', dest='with_ntvfs_fileserver')
opt.add_option('--without-ntvfs-fileserver',
help='disable the deprecated NTVFS file server from the original Samba4 branch',
action='store_false', dest='with_ntvfs_fileserver')
opt.add_option('--with-pie',
help=("Build Position Independent Executables " +
"(default if supported by compiler)"),
@ -282,19 +274,10 @@ def configure(conf):
conf.RECURSE('lib/crypto')
conf.RECURSE('pidl')
if conf.CONFIG_GET('ENABLE_SELFTEST'):
if Options.options.with_ntvfs_fileserver != False:
if not (Options.options.without_ad_dc):
conf.DEFINE('WITH_NTVFS_FILESERVER', 1)
if Options.options.with_ntvfs_fileserver == False:
if not (Options.options.without_ad_dc):
raise Errors.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC')
if not (Options.options.without_ad_dc):
conf.DEFINE('WITH_NTVFS_FILESERVER', 1)
conf.RECURSE('testsuite/unittests')
if Options.options.with_ntvfs_fileserver == True:
if Options.options.without_ad_dc:
raise Errors.WafError('--with-ntvfs-fileserver conflicts with --without-ad-dc')
conf.DEFINE('WITH_NTVFS_FILESERVER', 1)
if Options.options.with_pthreadpool:
if conf.CONFIG_SET('HAVE_PTHREAD'):
conf.DEFINE('WITH_PTHREADPOOL', '1')