From b7f330c509286df4fdc9d91ee16cb7244a6fabb1 Mon Sep 17 00:00:00 2001
From: Michael Hampton <io_error@uncensored.citadel.org>
Date: Mon, 14 Oct 2002 08:27:41 +0000
Subject: [PATCH] * Mac OS X build fixes (everything but serv_imap now builds)

---
 citadel/ChangeLog     | 4 ++++
 citadel/Makefile.in   | 4 ++--
 citadel/citadel_ipc.c | 2 ++
 citadel/configure.ac  | 3 ++-
 citadel/control.c     | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 04706b321..71ec8db9b 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.23  2002/10/14 08:27:40  error
+ * Mac OS X build fixes (everything but serv_imap now builds)
+
  Revision 601.22  2002/10/08 09:44:52  error
  * Build environment:  cvs ignore .diff/.patch files
 
@@ -4061,3 +4064,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
+
diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 5c13c9486..6e65f962d 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -165,8 +165,8 @@ modules/libpop3.la: serv_pop3.lo md5.lo $(LIBTOOL) libcitserver.la
 modules/libmrtg.la: serv_mrtg.lo md5.lo $(LIBTOOL) libcitserver.la
 	$(LTSHARE) -o libmrtg.la ../serv_mrtg.lo ../libcitserver.la
 
-modules/libspam.la: serv_spam.lo md5.lo $(LIBTOOL) libcitserver.la
-	$(LTSHARE) -o libspam.la ../serv_spam.lo ../libcitserver.la
+modules/libspam.la: serv_spam.lo md5.lo domain.lo $(LIBTOOL) libcitserver.la
+	$(LTSHARE) -o libspam.la ../serv_spam.lo ../domain.lo ../libcitserver.la
 
 modules/libinetcfg.la: serv_inetcfg.lo $(LIBTOOL) libcitserver.la
 	$(LTSHARE) -o libinetcfg.la ../serv_inetcfg.lo ../libcitserver.la
diff --git a/citadel/citadel_ipc.c b/citadel/citadel_ipc.c
index 88a3b5a91..93ad9ce65 100644
--- a/citadel/citadel_ipc.c
+++ b/citadel/citadel_ipc.c
@@ -19,7 +19,9 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <string.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #include <stdlib.h>
 #include <ctype.h>
 #include <sys/socket.h>
diff --git a/citadel/configure.ac b/citadel/configure.ac
index 57238fe59..732c348b5 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -201,8 +201,9 @@ fi
 test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib"
 AC_CHECK_LIB(resolv, res_query, RESOLV="$RESOLV -lresolv")
 
-if test "x$with_ncurses" != xno; then
+if test "x$with_ncurses" != "xno"; then
 	AC_SEARCH_LIBS(tgetent, [ncurses curses termcap])
+	AC_SEARCH_LIBS(scrollok, [ncurses curses])
 	AC_SEARCH_LIBS(initscr, [ncurses curses])
 else
 	AC_SEARCH_LIBS(tgetent, [curses termcap])
diff --git a/citadel/control.c b/citadel/control.c
index 8a507f22c..d1baeae50 100644
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -50,7 +50,7 @@
 #endif
 
 struct CitControl CitControl;
-struct config config;
+extern struct config config;
 FILE *control_fp = NULL;
 
 /*
-- 
2.30.2