diff options
author | Andreas Schneider <asn@samba.org> | 2015-12-04 08:12:03 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2017-04-29 23:31:09 +0200 |
commit | 6d19a66cf866197f17f9abe27387ae045daf0517 (patch) | |
tree | 4418d7983865eeb1ab211a618b6599a2ac98a836 /wscript | |
parent | eaaf5ce66e32d05b0a649619986d67ab6176a27a (diff) | |
download | samba-6d19a66cf866197f17f9abe27387ae045daf0517.tar.gz |
waf: Do not disable the ntvfs fileserver when we have MIT DC build
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -190,17 +190,15 @@ def configure(conf): if Options.options.with_pam: conf.RECURSE('lib/pam_wrapper') if Options.options.with_ntvfs_fileserver != False: - if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + 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 or Options.options.with_system_mitkrb5): + if not (Options.options.without_ad_dc): raise Utils.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC') if Options.options.with_ntvfs_fileserver == True: if Options.options.without_ad_dc: raise Utils.WafError('--with-ntvfs-fileserver conflicts with --without-ad-dc') - if Options.options.with_system_mitkrb5: - raise Utils.WafError('--with-ntvfs-fileserver conflicts with --with-system-mitkrb5') conf.DEFINE('WITH_NTVFS_FILESERVER', 1) if Options.options.with_pthreadpool: |