* configure.in, Makefile.in: only build the server if we find pthreads

	* user_ops.c: include sysdep.h

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index a1d173c25975599115f719de74c6bcdf61f86f1a..18fa225b3c0516b41aa46e2c5518789a71ef4208 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,7 @@
 1998-09-29 Nathan Bryant <bryant@cs.usm.maine.edu>
-       * user_ops.c: fix compiler warning and potential memory leak
+       * user_ops.c: fix compiler warning and potential memory leak,
+         include sysdep.h
+       * configure.in, Makefile.in: only build the server if we find pthreads
 
 Tue Sep 29 13:20:14 EDT 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Removed code from some of the utilities which was still attempting

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 4290bfa9788ebbe09d7157c9dea0fe5435a3515b..42ee2f2a1e886b024ba9c29f47a9af478aae32ac 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -10,7 +10,9 @@
 #
 ########################################################################
 
-all: client server utils serv_modules
+TARGETS=@TARGETS@
+
+all: $(TARGETS)
 
 CLIENT_TARGETS=citadel whobbs
 SERVER_TARGETS=citserver setup

diff --git a/citadel/configure.in b/citadel/configure.in
index c26e425819256a209b3954215156454c0921aa89..c51635c491c8128859e028d2d6245750adbe6f92 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -23,13 +23,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)
-AC_CHECK_LIB(pthreads, pthread_create)
+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"])
 
 dnl Checks for header files.
 AC_HEADER_DIRENT
@@ -52,5 +56,6 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(mkdir mktime rmdir select socket strerror)
 
 AC_SUBST(CURSES)
+AC_SUBST(TARGETS)
 AC_CONFIG_HEADER(sysdep.h)
 AC_OUTPUT(Makefile)

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 65de3d3299759932f5598041abf134db8226cc8c..99f0605bb2dd193521e1c815f73549b3969b75a1 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -27,6 +27,7 @@
 #include "msgbase.h"
 #include "config.h"
 #include "dynloader.h"
+#include "sysdep.h"
 
 
 /*