* configure.in: updated help messages, OpenBSD support

        * setup.c: if /etc/inittab doesn't exist, don't ask to create an entry
          in it

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ceb48081771af7e0928d07fe1b05bfbc95b3a13d..57bbd5f1c2d49bbf92a561741d0b3b9f529695d9 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-07 Nathan Bryant <bryant@cs.usm.maine.edu>
+       * configure.in: updated help messages, OpenBSD support
+       * setup.c: if /etc/inittab doesn't exist, don't ask to create an entry
+         in it
+
 1999-04-06 Nathan Bryant <bryant@cs.usm.maine.edu>
        * Makefile.in, configure.in, getutline.c, sysdep.c:
          fixes/bug workarounds for FreeBSD

diff --git a/citadel/configure.in b/citadel/configure.in
index 8e5bf2b071c4761455b881cdfcade0f110d7bba5..4e11efd21525e7803a6eb847de6b6df8458191e0 100644 (file)
--- a/citadel/configure.in
+++ b/citadel/configure.in
@@ -11,7 +11,8 @@ fi
 
 AC_ARG_ENABLE(autologin, [  --disable-autologin     disable autologin (default is enabled if possible)])
 AC_ARG_ENABLE(chkpwd, [  --enable-chkpwd         build 'chkpwd' (use this if you have shadow passwords)])
-AC_ARG_WITH(pam, [  --with-pam              use PAM if present])
+AC_ARG_WITH(pam, [  --with-pam              use PAM if present (see PAM.txt before you try this)])
+AC_ARG_WITH(kthread, [  --with-kthread          use kernel threads (on FreeBSD) (not recommended yet)])
 
 dnl By default, we only build the client (citadel and whobbs) unless we can
 dnl figure out how to build with POSIX threads.
@@ -38,7 +39,6 @@ case "$host" in
        ;;
        dnl FreeBSD is similar to Digital UNIX:
        *-*-freebsd*)
-               AC_ARG_WITH(kthread, [  --with-kthread          use kernel threads, not user])
                if test "$with_kthread" = yes; then
                        SERVER_LDFLAGS=-kthread
                else
@@ -47,6 +47,11 @@ case "$host" in
                check_pthread=no
                PTHREAD_DEFS=-D_THREAD_SAFE
        ;;
+       *-*-openbsd*)
+               SERVER_LDFLAGS=-pthread
+               check_pthread=no
+               PTHREAD_DEFS=-pthread
+       ;;
        *-*-cygwin32)
                SUFFIX=.exe
        ;;

diff --git a/citadel/setup.c b/citadel/setup.c
index 9ab1a5e487748fc6573ee66977ec31902c3fe8f6..7e8a4bcbfd4ccf853d80738703495a8137de7806 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -483,7 +483,7 @@ void check_inittab_entry(void) {
         */
        infp = fopen("/etc/inittab", "r");
        if (infp == NULL) {
-               display_error(strerror(errno));
+               return;
                }
        else {
                while (fgets(buf, 256, infp) != NULL) {