summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-07-16 13:26:12 +0200
committerJeremy Allison <jra@samba.org>2012-07-18 15:53:50 -0700
commit730d3e8973e3ef99aad126776a1db51282b226cb (patch)
tree8d66f0e52abbffc3ee8eb18335f42c8369be8dd7
parent4a9b5cce92d65317fee4583f1ece4af7a3ae9558 (diff)
downloadsamba-730d3e8973e3ef99aad126776a1db51282b226cb.tar.gz
samba-730d3e8973e3ef99aad126776a1db51282b226cb.tar.bz2
samba-730d3e8973e3ef99aad126776a1db51282b226cb.zip
s3: Compile with pthreadpool by default
Signed-off-by: Jeremy Allison <jra@samba.org>
-rw-r--r--source3/configure.in8
-rwxr-xr-xsource3/wscript2
2 files changed, 4 insertions, 6 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 4d3db00e40..6a26038d68 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6258,19 +6258,17 @@ fi
# Check if user wants pthreadpool support
AC_ARG_ENABLE(pthreadpool,
-[AS_HELP_STRING([--enable-pthreadpool], [Enable pthreads pool helper support (default=no)])])
+[AS_HELP_STRING([--enable-pthreadpool], [Enable pthreads pool helper support (default=yes)])])
if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
AC_MSG_ERROR([pthreadpool support cannot be enabled when pthread support was not found])
fi
-if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
+if test x"$enable_pthreadpool" != x"no" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
LIBS="$LIBS $PTHREAD_LDFLAGS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool.o")
- if test x"$samba_cv_HAVE_AIO" = x"yes"; then
- default_shared_modules="$default_shared_modules vfs_aio_pthread"
- fi
+ default_shared_modules="$default_shared_modules vfs_aio_pthread"
else
AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool_sync.o")
fi
diff --git a/source3/wscript b/source3/wscript
index 90a4b76570..91ffc2599a 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -37,7 +37,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('sys-quotas')
opt.SAMBA3_ADD_OPTION('sendfile-support')
opt.SAMBA3_ADD_OPTION('utmp')
- opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable")
+ opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable")
opt.SAMBA3_ADD_OPTION('iconv')
opt.SAMBA3_ADD_OPTION('acl-support')