From cc613b24ad4adb4183472937399d55a1518d96c3 Mon Sep 17 00:00:00 2001 From: Nathan Bryant Date: Fri, 20 Jul 2001 23:48:23 +0000 Subject: [PATCH] fix build on solaris, check default install location for db 3.2, and silence gcc 3.0 --- citadel/ChangeLog | 5 +++++ citadel/configure.in | 6 +++++- citadel/netproc.c | 2 +- citadel/sysdep_decls.h | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index e7fa3337d..10a862f97 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,4 +1,8 @@ $Log$ + Revision 580.5 2001/07/20 23:48:23 nbryant + fix build on solaris, check default install location for db 3.2, and silence + gcc 3.0 + Revision 580.4 2001/07/16 14:24:30 ajc * Silly cosmetic change to keep the wholist ordered by ascending session number @@ -2574,3 +2578,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant Fri Jul 10 1998 Art Cancro * Initial CVS import + diff --git a/citadel/configure.in b/citadel/configure.in index f1c1d5fe3..6a146ded0 100644 --- a/citadel/configure.in +++ b/citadel/configure.in @@ -32,6 +32,7 @@ if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then with_db=yes else test -d /usr/local/BerkeleyDB.3.1 && db_dir=/usr/local/BerkeleyDB.3.1 + test -d /usr/local/BerkeleyDB.3.2 && db_dir=/usr/local/BerkeleyDB.3.2 fi if test "x$with_gdbm" = xyes -a "x$with_db" = xyes; then @@ -152,6 +153,9 @@ fi dnl Check for HP/UX dyanmic loader. This should only be in -ldld. AC_CHECK_LIB(dld, shl_load, LIBS="-ldld $LIBS") +dnl Check for Solaris realtime support +AC_CHECK_LIB(rt, sched_yield) + dnl Determine the system's authentication capabilities, if autologin is dnl requested. We currently support PAM, standard getpwnam(), and getspnam() dnl (Linux shadow passwords) @@ -193,7 +197,7 @@ if test "x$with_db" != xno -a "x$with_gdbm" != xyes; then AC_CHECK_LIB(db, db_env_create, [GDBM="$GDBM -ldb" DATABASE=database_sleepycat.c - with_gdbm=no]) + with_gdbm=no], [], [$NETLIBS]) fi if test "x$with_gdbm" != xno -a "x$with_db" != xyes; then diff --git a/citadel/netproc.c b/citadel/netproc.c index 7645f4f8f..d88898be7 100644 --- a/citadel/netproc.c +++ b/citadel/netproc.c @@ -596,7 +596,7 @@ BONFGM: b = getc(fp); strcpy(buffer->Z, bbb); goto BONFGM; -END: +END:; } diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h index 1398f30b0..a38ce98c3 100644 --- a/citadel/sysdep_decls.h +++ b/citadel/sysdep_decls.h @@ -24,4 +24,4 @@ inline void become_session(struct CitContext *which_con); void CtdlRedirectOutput(FILE *fp, int sock); extern int num_sessions; -extern int time_to_die; +extern volatile int time_to_die; -- 2.39.2