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. --- source4/ntvfs/posix/wscript_build | 2 +- source4/ntvfs/wscript_build | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 2a6a3dc277..6ac22e1e84 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -50,7 +50,7 @@ bld.SAMBA_LIBRARY('posix_eadb', source='posix_eadb.c', deps='tdb tdb-wrap', autoproto='posix_eadb_proto.h', - private_library=True) + private_library=True) bld.SAMBA_PYTHON('python_posix_eadb', source='python/pyposix_eadb.c', diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index 455e7f0b8b..6e3ee6da72 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -1,9 +1,18 @@ #!/usr/bin/env python -bld.RECURSE('posix') -bld.RECURSE('common') -bld.RECURSE('unixuid') -bld.RECURSE('sysdep') +bld.SAMBA_LIBRARY('ntvfs', + source='ntvfs_base.c ntvfs_generic.c ntvfs_interface.c ntvfs_util.c', + autoproto='ntvfs_proto.h', + deps='tevent samba-modules', + private_library=True, + enabled=bld.AD_DC_BUILD_IS_ENABLED() + ) + +if bld.AD_DC_BUILD_IS_ENABLED(): + bld.RECURSE('posix') + bld.RECURSE('common') + bld.RECURSE('unixuid') + bld.RECURSE('sysdep') bld.SAMBA_MODULE('ntvfs_cifs', source='cifs/vfs_cifs.c', @@ -64,10 +73,3 @@ bld.SAMBA_MODULE('ntvfs_nbench', ) -bld.SAMBA_LIBRARY('ntvfs', - source='ntvfs_base.c ntvfs_generic.c ntvfs_interface.c ntvfs_util.c', - autoproto='ntvfs_proto.h', - deps='tevent samba-modules', - private_library=True - ) - -- cgit