From dd25d75b96e9930e441663e5d8e95a84eeed5c62 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Fri, 3 Feb 2017 15:13:49 -0800 Subject: Move pthreadpool to top of the tree. Signed-off-by: Matthieu Patou Reviewed-by: Jeremy Allison --- wscript | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'wscript') diff --git a/wscript b/wscript index 9168db122ae..9706e0f9c9a 100644 --- a/wscript +++ b/wscript @@ -9,6 +9,7 @@ VERSION=None 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 samba_dist.DIST_DIRS('.') @@ -44,6 +45,7 @@ def set_options(opt): opt.RECURSE('source3') opt.RECURSE('lib/util') opt.RECURSE('ctdb') + opt.samba_add_onoff_option('pthreadpool', with_name="enable", without_name="disable", default=True) opt.add_option('--with-system-mitkrb5', help='enable system MIT krb5 build (includes Samba 4 client and Samba 3 code base).'+ @@ -183,6 +185,14 @@ def configure(conf): 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: + if conf.CONFIG_SET('HAVE_PTHREAD'): + conf.DEFINE('WITH_PTHREADPOOL', '1') + else: + Logs.warn("pthreadpool support cannot be enabled when pthread support was not found") + conf.undefine('WITH_PTHREADPOOL') + conf.RECURSE('source3') conf.RECURSE('lib/texpect') if conf.env.with_ctdb: -- cgit v1.2.1