configure/genstamp: check for struct tm.tm_gmtoff

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 8393acd405223bdd456802e364f211d9493113f0..e27d5475b5a0bec7bcd442c29ce34100e26cecbc 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -40,9 +40,9 @@ SERV_MODULES=modules/libchat.la modules/libvcard.la \
        modules/libexpire.la \
        modules/libvandelay.la \
        modules/libical.la
-UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
-       stats citmail netpoll mailinglist userlist sendcommand \
-       base64 qpdecode
+UTIL_TARGETS=aidepost netsetup msgform readlog \
+       stats citmail userlist sendcommand \
+       base64 migratenet
 
 prefix=@prefix@
 srcdir=@srcdir@
@@ -68,6 +68,7 @@ INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 SHELL=/bin/sh
 AUTOCONF=@AUTOCONF@
+ACLOCAL=@ACLOCAL@
 YACC=@YACC@
 DATABASE=@DATABASE@
 
@@ -82,13 +83,13 @@ DOMAIN=@DOMAIN@
 
 SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
        config.c control.c $(DATABASE) dynloader.c file_ops.c \
-       housekeeping.c internetmail.c ipc_c_tcp.c locate_host.c \
-       logging.c mailinglist.c messages.c msgbase.c msgform.c netmailer.c \
-       netpoll.c netproc.c netsetup.c policy.c rcit.c readlog.c \
+       housekeeping.c ipc_c_tcp.c locate_host.c \
+       logging.c messages.c msgbase.c msgform.c \
+       netsetup.c policy.c readlog.c migratenet.c \
        room_ops.c rooms.c routines.c routines2.c serv_chat.c \
        serv_info.c serv_test.c setup.c snprintf.c stats.c serv_vcard.c \
        support.c sysdep.c tools.c user_ops.c userlist.c serv_expire.c \
-       whobbs.c sendcommand.c mime_parser.c base64.c qpdecode.c getutline.c \
+       whobbs.c sendcommand.c mime_parser.c base64.c getutline.c \
        auth.c chkpwd.c html.c vcard.c serv_upgrade.c serv_vandelay.c \
        serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
        $(DOMAIN) clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c \
@@ -121,10 +122,6 @@ citadel$(EXEEXT): ipc_c_tcp$(CX) citadel$(CX) rooms$(CX) routines$(CX) \
        client_passwords$(CX) md5$(CX) \
        $(LIBOBJS) $(LDFLAGS) -o citadel $(NETLIBS) $(CLIENT_PTLIBS)
 
-netpoll: netpoll.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
-       $(CC) netpoll.o config.o ipc_c_tcp.o tools.o \
-       $(LIBOBJS) $(LDFLAGS) -o netpoll $(NETLIBS)
-
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
 
@@ -145,12 +142,12 @@ LIBSERV_OBJS = user_ops.lo citserver.lo sysdep.lo dynloader.lo tools.lo $(DATABA
        parsedate.lo genstamp.lo clientsocket.lo $(AUTH) $(LIBOBJS:.o=.lo)
 
 libcitserver.la: $(LIBSERV_OBJS)
-       $(LIBTOOL) $(CC) -rpath $(prefix) -no-undefined -avoid-version \
-       -o libcitserver.la $(LIBSERV_OBJS) $(GDBM)
+       $(LIBTOOL) $(CC) $(LDFLAGS) -rpath $(prefix) -no-undefined -avoid-version \
+       -o libcitserver.la $(LIBSERV_OBJS) $(GDBM) $(LIBS) $(PTHREAD_LIBS) $(NETLIBS) $(RESOLV)
 
 citserver: $(SERV_OBJS) $(LIBTOOL) libcitserver.la
-       $(LIBTOOL) --mode=link $(CC) $(SERV_OBJS) $(LDFLAGS) $(PTHREAD_LIBS) \
-       $(LIBS) $(NETLIBS) $(RESOLV) libcitserver.la -o citserver
+       $(LIBTOOL) --mode=link $(CC) $(SERV_OBJS) $(LDFLAGS) libcitserver.la -o \
+       citserver $(PTHREAD_LIBS)
 
 .c.ro:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
@@ -205,7 +202,7 @@ modules/libimap.la: serv_imap.lo imap_tools.lo imap_fetch.lo \
                ../imap_fetch.lo ../imap_search.lo ../imap_store.lo ../imap_misc.lo ../libcitserver.la
 
 aidepost: aidepost.o libcitserver.la $(LIBOBJS)
-       $(LIBTOOL) $(CC) aidepost.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o aidepost
+       $(LIBTOOL) $(CC) aidepost.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o aidepost $(PTHREAD_LIBS)
 
 modules/libpas2.la: serv_pas2.lo md5.lo $(LIBTOOL) libcitserver.la
        $(LTSHARE) -o libpas2.la ../serv_pas2.lo ../md5.lo ../libcitserver.la
@@ -213,27 +210,9 @@ modules/libpas2.la: serv_pas2.lo md5.lo $(LIBTOOL) libcitserver.la
 modules/libical.la: serv_ical.lo $(LIBTOOL) libcitserver.la
        $(LTSHARE) -o libical.la ../serv_ical.lo ../libcitserver.la
 
-
-
-#
-# 'netmailer' needs to run setuid because it generates headers for Internet
-# mail.  If it is not run setuid, all outgoing mail may always show as coming
-# from your BBSUID rather than the actual sending user.
-#
-netmailer: netmailer.o internetmail.o config.o genstamp.o
-       $(CC) netmailer.o config.o internetmail.o genstamp.o \
-       $(LDFLAGS) -o netmailer
-
-netproc: netproc.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
-       $(CC) netproc.o config.o ipc_c_tcp.o tools.o \
-       $(LIBOBJS) $(LDFLAGS) -o netproc $(NETLIBS)
-
 citmail: citmail.o config.o
        $(CC) citmail.o config.o $(LDFLAGS) -o citmail $(NETLIBS)
 
-mailinglist: mailinglist.o config.o internetmail.o
-       $(CC) mailinglist.o config.o internetmail.o $(LDFLAGS) -o mailinglist
-
 setup: setup.o tools.o
        $(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o setup
 
@@ -246,12 +225,12 @@ netsetup: netsetup.o config.o
 whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS)
        $(CC) whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(NETLIBS)
 
+migratenet$(EXEEXT): migratenet.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
+       $(CC) migratenet.o config.o ipc_c_tcp.o tools.o $(LIBOBJS) $(LDFLAGS) -o migratenet $(NETLIBS)
+
 sendcommand: sendcommand.o ipc_c_tcp.o libcitserver.la $(LIBOBJS)
        $(LIBTOOL) $(CC) sendcommand.o ipc_c_tcp.o libcitserver.la \
-        $(LIBOBJS) $(LDFLAGS) -o sendcommand $(NETLIBS)
-
-qpdecode: qpdecode.o
-       $(CC) qpdecode.o $(LDFLAGS) -o qpdecode
+        $(LIBOBJS) $(LDFLAGS) -o sendcommand $(NETLIBS) $(PTHREAD_LIBS)
 
 base64: base64.o
        $(CC) base64.o $(LDFLAGS) -o base64
@@ -266,11 +245,8 @@ msgform: msgform.o
 readlog: readlog.o config.o
        $(CC) readlog.o config.o $(LDFLAGS) -o readlog
 
-rcit: rcit.o config.o
-       $(CC) rcit.o config.o $(LDFLAGS) -o rcit
-
 stats: stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS)
-       $(LIBTOOL) $(CC) stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS)
+       $(LIBTOOL) $(CC) stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS) $(PTHREAD_LIBS)
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
@@ -349,6 +325,9 @@ config.status: $(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
        cd $(srcdir) && $(AUTOCONF)
 
+$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
+       cd $(srcdir) && $(ACLOCAL)
+
 weekly: $(srcdir)/weekly.in config.status
        CONFIG_FILES=weekly CONFIG_HEADERS= $(SHELL) ./config.status