s3: by default don't use pthread pool support

(cherry picked from commit 118725c892e445fcc1dc5947cb919cf99c49373f)

The last seven patches address bug #6983 (Build with aio support fails on Debian
Sarge).

diff --git a/source3/configure.in b/source3/configure.in
index c47eced5530e6216e9b4b3b39a05fd318ed8d67d..0529a6945963954594a402329ab892ca2040d759 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6341,14 +6341,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])