X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript;h=f98d731e537e0fa13712503313d6cf7a59ce4292;hb=8479401b028fe61f514c42aa9d238c0c630f0d94;hp=7dbaa90e7735bd5ad438c5c85c0cb60cd9b4b8eb;hpb=6fbc8b810e094b946b92fb720953400fe28041ab;p=samba.git diff --git a/wscript b/wscript index 7dbaa90e773..f98d731e537 100644 --- a/wscript +++ b/wscript @@ -10,7 +10,7 @@ import sys, os, tempfile sys.path.insert(0, srcdir+"/buildtools/wafsamba") import wafsamba, Options, samba_dist, samba_git, Scripting, Utils, samba_version import Logs, samba_utils - +import shutil samba_dist.DIST_DIRS('.') samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions') @@ -35,8 +35,10 @@ def system_mitkrb5_callback(option, opt, value, parser): def set_options(opt): opt.BUILTIN_DEFAULT('NONE') opt.PRIVATE_EXTENSION_DEFAULT('samba4') + opt.RECURSE('lib/audit_logging') opt.RECURSE('lib/replace') opt.RECURSE('dynconfig') + opt.RECURSE('packaging') opt.RECURSE('lib/ldb') opt.RECURSE('selftest') opt.RECURSE('source4/lib/tls') @@ -46,6 +48,8 @@ def set_options(opt): opt.RECURSE('lib/util') opt.RECURSE('lib/crypto') opt.RECURSE('ctdb') + + opt.samba_add_onoff_option('pthreadpool', with_name="enable", without_name="disable", default=True) opt.add_option('--with-system-mitkrb5', @@ -58,6 +62,14 @@ def set_options(opt): dest='with_system_mitkdc', default=None) + opt.add_option('--with-system-heimdalkrb5', + help=('build Samba with system Heimdal Kerberos. ' + + 'Requires --without-ad-dc' and + 'conflicts with --with-system-mitkrb5'), + action='store_true', + dest='with_system_heimdalkrb5', + default=False) + opt.add_option('--without-ad-dc', 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) @@ -102,6 +114,13 @@ def configure(conf): if Options.options.developer: conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD') conf.env.DEVELOPER = True + # if we are in a git tree without a pre-commit hook, install a + # simple default. + pre_commit_hook = os.path.join(srcdir, '.git/hooks/pre-commit') + if (os.path.isdir(os.path.dirname(pre_commit_hook)) and + not os.path.exists(pre_commit_hook)): + shutil.copy(os.path.join(srcdir, 'script/git-hooks/pre-commit-hook'), + pre_commit_hook) conf.ADD_EXTRA_INCLUDES('#include/public #source4 #lib #source4/lib #source4/include #include #lib/replace') @@ -176,8 +195,17 @@ def configure(conf): else: conf.define('USING_SYSTEM_UID_WRAPPER', 1) + if not conf.CHECK_PAM_WRAPPER(): + raise Utils.WafError('pam_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.') + else: + conf.define('USING_SYSTEM_PAM_WRAPPER', 1) + conf.RECURSE('lib/ldb') + if conf.CHECK_LDFLAGS(['-Wl,--wrap=test']): + conf.env['HAVE_LDWRAP'] = True + conf.define('HAVE_LDWRAP', 1) + if not (Options.options.without_ad_dc): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) @@ -186,6 +214,18 @@ def configure(conf): if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + if Options.options.with_system_heimdalkrb5: + if Options.options.with_system_mitkrb5: + raise Utils.WafError('--with-system-heimdalkrb5 conflicts with ' + + '--with-system-mitkrb5') + if not Options.options.without_ad_dc: + raise Utils.WafError('--with-system-heimdalkrb5 requires ' + + '--without-ad-dc') + conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err', 'roken', + 'hx509', 'wind', 'gssapi', 'hcrypto', + 'krb5', 'heimbase', 'asn1_compile', + 'compile_et', 'kdc', 'hdb', 'heimntlm') + # 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'. @@ -193,6 +233,7 @@ def configure(conf): # system-provided or embedded Heimdal build if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'): conf.RECURSE('source4/heimdal_build') + conf.RECURSE('lib/audit_logging') conf.RECURSE('source4/lib/tls') conf.RECURSE('source4/dsdb/samdb/ldb_modules') conf.RECURSE('source4/ntvfs/sysdep') @@ -204,8 +245,6 @@ def configure(conf): conf.RECURSE('lib/crypto') conf.RECURSE('pidl') if conf.CONFIG_GET('ENABLE_SELFTEST'): - if Options.options.with_pam: - conf.RECURSE('lib/pam_wrapper') if Options.options.with_ntvfs_fileserver != False: if not (Options.options.without_ad_dc): conf.DEFINE('WITH_NTVFS_FILESERVER', 1) @@ -220,10 +259,18 @@ def configure(conf): conf.DEFINE('WITH_NTVFS_FILESERVER', 1) if Options.options.with_pthreadpool: - if conf.CONFIG_SET('HAVE_PTHREAD'): + if conf.CONFIG_SET('HAVE_PTHREAD') and \ + conf.CONFIG_SET('HAVE___THREAD') and \ + conf.CONFIG_SET('HAVE_ATOMIC_THREAD_FENCE_SUPPORT'): conf.DEFINE('WITH_PTHREADPOOL', '1') else: - Logs.warn("pthreadpool support cannot be enabled when pthread support was not found") + if not conf.CONFIG_SET('HAVE_PTHREAD'): + Logs.warn("pthreadpool support cannot be enabled when pthread support was not found") + if not conf.CONFIG_SET('HAVE_ATOMIC_THREAD_FENCE_SUPPORT'): + Logs.warn("""pthreadpool support cannot be enabled when there is + no support for atomic_thead_fence()""") + if not conf.CONFIG_SET('HAVE___THREAD'): + Logs.warn("pthreadpool support cannot be enabled when __thread support was not found") conf.undefine('WITH_PTHREADPOOL') conf.RECURSE('source3') @@ -232,7 +279,8 @@ def configure(conf): if conf.env.with_ctdb: conf.RECURSE('ctdb') conf.RECURSE('lib/socket') - conf.RECURSE('auth') + conf.RECURSE('lib/mscat') + conf.RECURSE('packaging') conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS() @@ -356,7 +404,7 @@ def dist(): os.system("make -C ctdb manpages") samba_dist.DIST_FILES('ctdb/doc:ctdb/doc', extend=True) - os.system(srcdir + "/release-scripts/build-manpages-nogit") + os.system("DOC_VERSION='" + sambaversion.STRING + "' " + srcdir + "/release-scripts/build-manpages-nogit") samba_dist.DIST_FILES('bin/docs:docs', extend=True) if sambaversion.IS_SNAPSHOT: