[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  118725c... s3: by default don't use pthread pool support
      from  ad6ea7b... lib/util: remove data_blob_talloc_reference()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 118725c892e445fcc1dc5947cb919cf99c49373f
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jan 29 12:42:25 2010 +0100

    s3: by default don't use pthread pool support

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 3c21bd6..7740b3a 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6388,14 +6388,14 @@ fi
 #################################################
 # Check if user wants pthreadpool support
 
+AC_ARG_ENABLE(pthreadpool,
+[AS_HELP_STRING([--enable-pthreadpool], [Enable pthreads pool helper support (default=no)])])
+
 if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
-	AC_MSG_ERROR([pthread support cannot be enabled when pthread header file not found])
+	AC_MSG_ERROR([pthreadpool support cannot be enabled when pthread support was found])
 fi
 
-AC_ARG_ENABLE(pthreadpool,
-[AS_HELP_STRING([--enable-pthreadpool], [Enable pthreads pool helper support (default=auto)])])
-
-if test x"$enable_pthreadpool" != x"no" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
+if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
     LIBS="$LIBS $PTHREAD_LDFLAGS"
     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
     AC_DEFINE(WITH_PTHREADPOOL, 1, [Whether to include pthreadpool helpers])


-- 
Samba Shared Repository