* configure.in: pass -pthread to DEC compiler, don't check for

          libpthread[s] on DEC Unix

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 071ac07d956f4c69da4b2dbe57e05116acc70983..f43067341b4709c8192575214b278be4d8e12269 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -7,6 +7,8 @@
        * ipc_c_tcp.c: fix DEC compiler warning wrt unsigned char
        * stats.c: add semicolon to placate DREC compiler
        * user_ops.c: define _POSIX_C_SOURCE, include <limits.h>
+       * configure.in: pass -pthread to DEC compiler, don't check for
+         libpthread[s] on DEC Unix
 
 1998-09-30 Nathan Bryant <bryant@cs.usm.maine.edu>
        * Makefile.in: new variable PTHREAD_DEFS for portability

diff --git a/citadel/configure.in b/citadel/configure.in
index 8a44558c522fca9f6d9c53916e6153d6eabca761..986f294972d05026ab7d0670eb276659df53fcf0 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -16,6 +16,8 @@ AC_ARG_ENABLE(ansi-color, [  --enable-ansi-color     enable ANSI color (default
        AC_DEFINE(ANSI_COLOR)
 fi])
 
+TARGETS=client
+
 AC_CANONICAL_HOST
 case "$host" in
        alpha*-dec-osf*)
@@ -23,6 +25,8 @@ case "$host" in
                if test -z "$CC"; then
                        CC=cc
                fi
+               SERVER_LDFLAGS=-pthread
+               TARGETS="client server utils serv_modules"
        ;;
 esac
 
@@ -34,17 +38,17 @@ if test "$GCC" = yes; then
 fi
 AC_PROG_RANLIB
 
-TARGETS=client
-
 dnl Checks for libraries.
 AC_CHECK_LIB(crypt, crypt)
 AC_CHECK_LIB(dl, dlopen)
 AC_CHECK_LIB(gdbm, gdbm_open)
 AC_CHECK_LIB(curses, initscr, CURSES=-lcurses)
-AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"
-       TARGETS="client server utils serv_modules"])
-AC_CHECK_LIB(pthreads, pthread_create, [LIBS="$LIBS -lpthreads"
-       TARGETS="client server utils serv_modules"])
+if test "$SERVER_LDFLAGS" != -pthread; then
+       AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"
+               TARGETS="client server utils serv_modules"])
+       AC_CHECK_LIB(pthreads, pthread_create, [LIBS="$LIBS -lpthreads"
+               TARGETS="client server utils serv_modules"])
+fi
 
 dnl Checks for header files.
 AC_HEADER_DIRENT