X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fopenldap.m4;h=783f30f2c19d166cde62ea28fcdf288938adc0a9;hb=5ca8773a8b20059b211828ae75d86492b49fc4aa;hp=846fe85eb24f50614503f8ad5445f598a6ef82b3;hpb=5dede11811e9c31a71b956429de9fb6aa27cecaf;p=openldap

diff --git a/build/openldap.m4 b/build/openldap.m4
index 846fe85eb2..783f30f2c1 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -254,7 +254,7 @@ AC_DEFUN([OL_BERKELEY_DB_TRY],
 [
 	ol_DB_LIB=ifelse($2,,,$2)
 	ol_LIBS=$LIBS
-	LIBS="$ol_DB_LIB $LIBS"
+	LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS"
 
 	AC_TRY_LINK([
 #ifdef HAVE_DB_185_H
@@ -328,8 +328,9 @@ dnl Check if Berkeley DB supports DB_THREAD
 AC_DEFUN([OL_BERKELEY_DB_THREAD],
 [AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [
 	ol_LIBS="$LIBS"
+	LIBS="$LTHREAD_LIBS $LIBS"
 	if test $ol_cv_lib_db != yes ; then
-		LIBS="$ol_cv_lib_db"
+		LIBS="$ol_cv_lib_db $LIBS"
 	fi
 
 	AC_TRY_RUN([
@@ -401,12 +402,13 @@ main()
 	[ol_cv_berkeley_db_thread=cross])
 
 	LIBS="$ol_LIBS"
+])
 
 	if test $ol_cv_berkeley_db_thread != no ; then
 		AC_DEFINE(HAVE_BERKELEY_DB_THREAD, 1,
 			[define if Berkeley DB has DB_THREAD support])
 	fi
-])])dnl
+])dnl
 dnl
 dnl --------------------------------------------------------------------
 dnl Find any DB
@@ -437,7 +439,7 @@ AC_DEFUN([OL_BDB_COMPAT],
 #if DB_VERSION_MAJOR >= 4 
 	__db_version_compat
 #endif
-	],	[ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
 ])
 
 dnl --------------------------------------------------------------------
@@ -621,51 +623,48 @@ dnl
 dnl ====================================================================
 dnl Check POSIX Thread version 
 dnl
-dnl defines ol_cv_pthread_version to 0, 4, 5, 6, 7, 10, depending on the
+dnl defines ol_cv_pthread_version to 4, 5, 6, 7, 8, 10, depending on the
 dnl	version of the POSIX.4a Draft that is implemented.
 dnl	10 == POSIX.4a Final == POSIX.1c-1996 for our purposes.
-dnl 	0 implies that the version could not be detected
-dnl		or that pthreads.h does exist.  Existence of pthreads.h
-dnl		should be tested separately.
+dnl	Existence of pthread.h should be tested separately.
 dnl
 dnl tests:
-dnl	pthread_yield() was dropped in Draft 9, so
-dnl		only a Draft <= 8 library will define this
 dnl	pthread_detach() was dropped in Draft 8, it is present
 dnl		in every other version
 dnl	PTHREAD_CREATE_UNDETACHED is only in Draft 7, it was called
 dnl		PTHREAD_CREATE_JOINABLE after that
+dnl	pthread_attr_create was renamed to pthread_attr_init in Draft 6.
+dnl		Draft 6-10 has _init, Draft 4-5 has _create.
 dnl	pthread_attr_default was dropped in Draft 6, only 4 and 5 have it
 dnl	PTHREAD_MUTEX_INITIALIZER was introduced in Draft 5. It's not
 dnl		interesting to us because we don't try to statically
 dnl		initialize mutexes. 5-10 has it.
-dnl	pthread_attr_create was renamed to pthread_attr_init after Draft 4.
-dnl		Draft 6-10 has _init, Draft 4 has _create. (dunno about 5)
 dnl
 dnl Draft 9 and 10 are equivalent for our purposes.
 dnl
 AC_DEFUN([OL_POSIX_THREAD_VERSION],
 [AC_CACHE_CHECK([POSIX thread version],[ol_cv_pthread_version],[
-	AC_EGREP_HEADER(pthread_yield,pthread.h,[
-	AC_EGREP_HEADER(pthread_detach,pthread.h,[
+	AC_TRY_COMPILE([
+#		include <pthread.h>
+	],[
+		int i = PTHREAD_CREATE_JOINABLE;
+	],[
+	AC_EGREP_HEADER(pthread_detach,pthread.h,
+	ol_cv_pthread_version=10, ol_cv_pthread_version=8)],[
 	AC_EGREP_CPP(draft7,[
 #		include <pthread.h>
 #		ifdef PTHREAD_CREATE_UNDETACHED
 		draft7
 #		endif
 	], ol_cv_pthread_version=7, [
-	AC_EGREP_HEADER(pthread_attr_default,pthread.h,[
+	AC_EGREP_HEADER(pthread_attr_init,pthread.h,
+	ol_cv_pthread_version=6, [
 	AC_EGREP_CPP(draft5,[
 #		include <pthread.h>
 #ifdef		PTHREAD_MUTEX_INITIALIZER
 		draft5
 #endif
-	], ol_cv_pthread_version=5, [
-	AC_EGREP_HEADER(pthread_attr_create,pthread.h,
-	ol_cv_pthread_version=4, ol_cv_pthread_version=0) ]) ],
-	ol_cv_pthread_version=6) ]) ],
-	ol_cv_pthread_version=8) ],
-	ol_cv_pthread_version=10)
+	], ol_cv_pthread_version=5, ol_cv_pthread_version=4) ]) ]) ])
 ])
 ])dnl
 dnl