Update configure to handle DEC OSF1 3.2 special cases.

-thread & -pthread are still treated as libraries, will need
additional work to use them as CFLAGS.
Eliminated HAVE_DCE define (was redundant) and its use.  Code
now relies on draft4 and function existance tests.

acconfig.h

@@ -12,6 +12,9 @@
 /* define this if needed to get threadsafe functions */
 #undef _THREAD_SAFE
 
+/* define this if needed to get threadsafe functions */
+#undef _THREADSAFE
+
 /* define this if toupper() requires tolower() check */
 #undef C_UPPER_LOWER
 
@@ -27,9 +30,6 @@
 /* define if you have crypt */
 #undef HAVE_CRYPT
 
-/* define if you have DCE */
-#undef HAVE_DCE
-
 /* define if you have DSAP */
 #undef HAVE_DSAP
 

configure.in

@@ -322,7 +322,6 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
 	fi
 fi
 
-
 ol_link_threads=no
 if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
 	AC_CHECK_HEADERS(pthread.h sched.h)
@@ -393,12 +392,24 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
 		fi
 
 		if test $ol_link_threads = no ; then
-			dnl try DEC Threads
+			dnl try DEC Threads -lpthread -lexc
 			save_LIBS="$LIBS"
 			AC_CHECK_LIB(pthread, pthread_create, [
-				AC_DEFINE(HAVE_DCE)
 				ol_link_threads=posix
-				LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc_r"
+				LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
+				if test $ol_with_preemptive = auto ; then
+					ol_with_preemptive=yes
+				fi
+				],,[-lexc])
+			LIBS="$save_LIBS"
+		fi
+
+		if test $ol_link_threads = no ; then
+			dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
+			save_LIBS="$LIBS"
+			AC_CHECK_LIB(pthreads, pthread_create, [
+				ol_link_threads=posix
+				LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
 				if test $ol_with_preemptive = auto ; then
 					ol_with_preemptive=yes
 				fi
@@ -664,6 +675,7 @@ if test $ol_with_threads != no ; then
 	dnl
 	AC_DEFINE(_REENTRANT,1)
 	AC_DEFINE(_THREAD_SAFE,1)
+	AC_DEFINE(_THREADSAFE,1)
 fi
 
 dnl ----------------------------------------------------------------

include/portable.h.in

@@ -112,6 +112,9 @@ is provided ``as is'' without express or implied warranty.
 /* define this if needed to get threadsafe functions */
 #undef _THREAD_SAFE
 
+/* define this if needed to get threadsafe functions */
+#undef _THREADSAFE
+
 /* define this if toupper() requires tolower() check */
 #undef C_UPPER_LOWER
 
@@ -127,9 +130,6 @@ is provided ``as is'' without express or implied warranty.
 /* define if you have crypt */
 #undef HAVE_CRYPT
 
-/* define if you have DCE */
-#undef HAVE_DCE
-
 /* define if you have DSAP */
 #undef HAVE_DSAP
 

servers/slapd/connection.c

@@ -201,7 +201,7 @@ connection_activity(
 
 	pthread_attr_init( &attr );
 	pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
-#if !defined(HAVE_PTHREADS_D4) && !defined(HAVE_DCE)
+#if !defined(HAVE_PTHREADS_D4)
 	/* POSIX_THREADS or compatible
 	 * This is a draft 10 or standard pthreads implementation
 	 */

servers/slapd/main.c

@@ -187,7 +187,7 @@ main( argc, argv )
 		pthread_attr_init( &attr );
 		pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
 
-#if !defined(HAVE_PTHREADS_D4) && !defined(HAVE_DCE)
+#if !defined(HAVE_PTHREADS_D4)
 		/* POSIX_THREADS or compatible
 		 * This is a draft 10 or standard pthreads implementation
 		 */

servers/slurpd/main.c

@@ -124,7 +124,7 @@ main(
      */
     pthread_attr_init( &attr );
 
-#if !defined(HAVE_PTHREADS_D4) && !defined(HAVE_DCE)
+#if !defined(HAVE_PTHREADS_D4)
     /* POSIX_THREADS or compatible
      * This is a draft 10 or standard pthreads implementation
      */

servers/slurpd/replica.c

@@ -60,7 +60,7 @@ start_replica_thread(
     pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
 #endif
 
-#if !defined(HAVE_PTHREAD_D4) && !defined(HAVE_DCE)
+#if !defined(HAVE_PTHREAD_D4)
     /* POSIX_THREADS or compatible
      * This is a draft 10 or standard pthreads implementation
      */