fix build on solaris, check default install location for db 3.2, and silence

gcc 3.0

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index e7fa3337d438c841385431fae9b42d1257206777..10a862f972946c9c052df16d9626c434f9e4baeb 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
  $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
 
  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 <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 

+

diff --git a/citadel/configure.in b/citadel/configure.in
index f1c1d5fe342c2535128ad1a8f710a94f15afb91e..6a146ded04ebe25d1b88fc34e5157eef23962c38 100644 (file)
--- 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
        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
 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 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)
 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
        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
 fi
 
 if test "x$with_gdbm" != xno -a "x$with_db" != xyes; then

diff --git a/citadel/netproc.c b/citadel/netproc.c
index 7645f4f8f41fa1fa299d526abec9bfd4b59ea334..d88898be7213f8090ed15dff64dbb28dcd63325f 100644 (file)
--- a/citadel/netproc.c
+++ b/citadel/netproc.c
@@ -596,7 +596,7 @@ BONFGM:     b = getc(fp);
                strcpy(buffer->Z, bbb);
        goto BONFGM;
 
                strcpy(buffer->Z, bbb);
        goto BONFGM;
 

-END:
+END:;

 
 }
 
 
 }
 

diff --git a/citadel/sysdep_decls.h b/citadel/sysdep_decls.h
index 1398f30b05bc0f8b8aecaf15a37ac77ba4d39b88..a38ce98c375b8c02c700b8fb6b1f6eb332ee15d3 100644 (file)
--- 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;
 void CtdlRedirectOutput(FILE *fp, int sock);
 
 extern int num_sessions;

-extern int time_to_die;
+extern volatile int time_to_die;