summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2012-05-21 12:45:12 +0300
committerAlexander Bokovoy <ab@samba.org>2012-05-23 17:51:50 +0300
commit2ddf89a2bc3c00b71dec230f071416e594f89113 (patch)
tree1fad0fc85214ffcd807a767677692846a7fd1848 /source4/scripting
parent2fc96e695599312c26576b5d0a0f6a86852131c4 (diff)
downloadsamba-2ddf89a2bc3c00b71dec230f071416e594f89113.tar.gz
samba-2ddf89a2bc3c00b71dec230f071416e594f89113.tar.bz2
samba-2ddf89a2bc3c00b71dec230f071416e594f89113.zip
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.
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/bin/wscript_build9
-rw-r--r--source4/scripting/wscript_build15
2 files changed, 15 insertions, 9 deletions
diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index 459b917d01..200562b126 100644
--- a/source4/scripting/bin/wscript_build
+++ b/source4/scripting/bin/wscript_build
@@ -1,8 +1,7 @@
#!/usr/bin/env python
-bld.SAMBA_SCRIPT('samba_dnsupdate', pattern='samba_dnsupdate', installdir='.')
-bld.SAMBA_SCRIPT('samba_spnupdate', pattern='samba_spnupdate', installdir='.')
-bld.SAMBA_SCRIPT('samba_kcc', pattern='samba_kcc', installdir='.')
-bld.SAMBA_SCRIPT('upgradeprovision', pattern='upgradeprovision', installdir='.')
+if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+ for script in ['samba_dnsupdate', 'samba_spnupdate', 'samba_kcc', 'upgradeprovision', 'samba_upgradedns']:
+ bld.SAMBA_SCRIPT(script, pattern=script, installdir='.')
+
bld.SAMBA_SCRIPT('samba-tool', pattern='samba-tool', installdir='.')
-bld.SAMBA_SCRIPT('samba_upgradedns', pattern='samba_upgradedns', installdir='.')
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index 1cd024160d..221f03086f 100644
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -2,12 +2,19 @@
from samba_utils import MODE_755
-bld.INSTALL_FILES('${SBINDIR}',
- 'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns',
- chmod=MODE_755, python_fixup=True, flat=True)
+sbin_files = None
+bin_files = 'bin/samba-tool'
+if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+ sbin_files = 'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns'
+ bin_files = bin_files + ' bin/samba_kcc'
+
+if sbin_files:
+ bld.INSTALL_FILES('${SBINDIR}',
+ 'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns',
+ chmod=MODE_755, python_fixup=True, flat=True)
bld.INSTALL_FILES('${BINDIR}',
- 'bin/samba-tool bin/samba_kcc',
+ bin_files,
chmod=MODE_755, python_fixup=True, flat=True)
bld.RECURSE('bin')