From c41961e7d8c2d88398699493879fcfb9817dd534 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sun, 12 Jun 2022 00:01:58 -0400 Subject: [PATCH] More tweaking to cleanly support bin and run directories. --- citadel/Makefile | 6 +- citadel/Makefile.in | 343 ------ citadel/README.txt | 3 +- citadel/configure.ac | 994 ------------------ citadel/{COPYING => license.txt} | 0 citadel/mkinstalldirs | 38 - citadel/server/citadel_dirs.h | 4 +- .../server/modules/autocompletion/.gitignore | 1 - citadel/server/modules/bio/.gitignore | 1 - citadel/server/modules/bio/serv_bio.c | 71 +- citadel/server/modules/calendar/.gitignore | 1 - citadel/server/modules/checkpoint/.gitignore | 1 - citadel/server/modules/clamav/.gitignore | 1 - citadel/server/modules/crypto/.gitignore | 1 - citadel/server/modules/expire/.gitignore | 1 - citadel/server/modules/fulltext/.gitignore | 1 - citadel/server/modules/imap/.gitignore | 1 - citadel/server/modules/inboxrules/.gitignore | 1 - citadel/server/modules/inetcfg/.gitignore | 1 - citadel/server/modules/instmsg/.gitignore | 1 - citadel/server/modules/listsub/.gitignore | 1 - citadel/server/modules/migrate/.gitignore | 1 - citadel/server/modules/newuser/.gitignore | 1 - citadel/server/modules/notes/.gitignore | 1 - citadel/server/modules/openid/.gitignore | 1 - citadel/server/modules/pop3/.gitignore | 1 - citadel/server/modules/pop3client/.gitignore | 1 - citadel/server/modules/roomchat/.gitignore | 1 - citadel/server/modules/rssclient/.gitignore | 1 - citadel/server/modules/rwho/.gitignore | 1 - citadel/server/modules/smtp/.gitignore | 1 - citadel/server/modules/spam/.gitignore | 1 - citadel/server/modules/test/.gitignore | 1 - citadel/server/modules/upgrade/.gitignore | 1 - citadel/server/modules/vcard/.gitignore | 1 - citadel/server/modules/wiki/.gitignore | 1 - citadel/server/modules/xmpp/.gitignore | 1 - citadel/server/modules_init.c | 92 +- citadel/utils/guesstimezone.sh | 0 39 files changed, 78 insertions(+), 1502 deletions(-) delete mode 100644 citadel/Makefile.in delete mode 100644 citadel/configure.ac rename citadel/{COPYING => license.txt} (100%) delete mode 100755 citadel/mkinstalldirs delete mode 100644 citadel/server/modules/autocompletion/.gitignore delete mode 100644 citadel/server/modules/bio/.gitignore delete mode 100644 citadel/server/modules/calendar/.gitignore delete mode 100644 citadel/server/modules/checkpoint/.gitignore delete mode 100644 citadel/server/modules/clamav/.gitignore delete mode 100644 citadel/server/modules/crypto/.gitignore delete mode 100644 citadel/server/modules/expire/.gitignore delete mode 100644 citadel/server/modules/fulltext/.gitignore delete mode 100644 citadel/server/modules/imap/.gitignore delete mode 100644 citadel/server/modules/inboxrules/.gitignore delete mode 100644 citadel/server/modules/inetcfg/.gitignore delete mode 100644 citadel/server/modules/instmsg/.gitignore delete mode 100644 citadel/server/modules/listsub/.gitignore delete mode 100644 citadel/server/modules/migrate/.gitignore delete mode 100644 citadel/server/modules/newuser/.gitignore delete mode 100644 citadel/server/modules/notes/.gitignore delete mode 100644 citadel/server/modules/openid/.gitignore delete mode 100644 citadel/server/modules/pop3/.gitignore delete mode 100644 citadel/server/modules/pop3client/.gitignore delete mode 100644 citadel/server/modules/roomchat/.gitignore delete mode 100644 citadel/server/modules/rssclient/.gitignore delete mode 100644 citadel/server/modules/rwho/.gitignore delete mode 100644 citadel/server/modules/smtp/.gitignore delete mode 100644 citadel/server/modules/spam/.gitignore delete mode 100644 citadel/server/modules/test/.gitignore delete mode 100644 citadel/server/modules/upgrade/.gitignore delete mode 100644 citadel/server/modules/vcard/.gitignore delete mode 100644 citadel/server/modules/wiki/.gitignore delete mode 100644 citadel/server/modules/xmpp/.gitignore mode change 100644 => 100755 citadel/utils/guesstimezone.sh diff --git a/citadel/Makefile b/citadel/Makefile index d1cf0450e..ab939b439 100644 --- a/citadel/Makefile +++ b/citadel/Makefile @@ -54,10 +54,10 @@ clean: distclean: clean rm -vf config.mk -install: $(all) +install: $(all) utils/*.sh # # Installing to ${CTDLDIR} # - @for x in $(all) ; do \ - install -v -D -t ${CTDLDIR} $$x ;\ + @for x in $(all) utils/*.sh ; do \ + install -v -C -D -t ${CTDLDIR} $$x ;\ done diff --git a/citadel/Makefile.in b/citadel/Makefile.in deleted file mode 100644 index c4040db3a..000000000 --- a/citadel/Makefile.in +++ /dev/null @@ -1,343 +0,0 @@ -######################################################################## -# -# Makefile for Citadel Server -# -# NOTE: normally you should not have to modify the Makefile. All -# system-dependent configuration is in the "configure" script, which -# uses "Makefile.in" to generate a "Makefile". In the rare instance -# that you have to modify something here, please edit Makefile.in, -# *not* Makefile. -# -######################################################################## - -prefix=@prefix@ -srcdir=@srcdir@ -VPATH=$(srcdir) - -TARGETS=@TARGETS@ -RUN_DIR=@MAKE_RUN_DIR@ -SPOOL_DIR=@MAKE_SPOOL_DIR@ -ETC_DIR=@MAKE_ETC_DIR@ -DATA_DIR=@MAKE_DATA_DIR@ -STATICDATA_DIR=@MAKE_STATICDATA_DIR@ -HELP_DIR=@MAKE_HELP_DIR@ -DOC_DIR=@MAKE_DOC_DIR@ -UTILBIN_DIR=@MAKE_UTILBIN_DIR@ -DEPEND_FLAG=@DEPEND_FLAG@ -all: buildinfo $(TARGETS) - -.SUFFIXES: .o .d .c - -EXEEXT=@EXEEXT@ - -SERVER_TARGETS=citserver$(EXEEXT) - -include Make_modules - -UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT) - -UTILBIN_TARGETS= setup$(EXEEXT) \ - chkpw$(EXEEXT) chkpwd$(EXEEXT) \ - ctdlmigrate$(EXEEXT) - -ACLOCAL=@ACLOCAL@ -AUTOCONF=@AUTOCONF@ -chkpwd_LIBS=@chkpwd_LIBS@ -CC=@CC@ -CFLAGS=@CFLAGS@ -I. -Wno-format-truncation -Wno-unused-result -CPPFLAGS=@CPPFLAGS@ -I. -DATABASE=@DATABASE@ -DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\" -LDFLAGS=@LDFLAGS@ -rdynamic -LIBS=@LIBS@ -LIBOBJS=@LIBOBJS@ -INSTALL=@INSTALL@ -INSTALL_DATA=@INSTALL_DATA@ -RESOLV=@RESOLV@ -SHELL=/bin/sh -SERVER_LDFLAGS=@SERVER_LDFLAGS@ -rdynamic -SERVER_LIBS=@SERVER_LIBS@ -SETUP_LIBS=@SETUP_LIBS@ -YACC=@YACC@ -DIFF=@DIFF@ -PATCH=@PATCH@ -LOCALEDIR=@LOCALEDIR@ - -# End configuration section - -.SILENT: - - -SOURCES=citmail.c setup.c chkpw.c \ - sendcommand.c ctdlmigrate.c chkpwd.c \ - citadel_dirs.c \ - citserver.c clientsocket.c config.c control.c $(DATABASE) \ - domain.c serv_extensions.c genstamp.c \ - housekeeping.c default_timezone.c internet_addressing.c \ - locate_host.c auth.c msgbase.c parsedate.c \ - room_ops.c euidindex.c server_main.c ldap.c \ - support.c sysdep.c user_ops.c journaling.c threads.c \ - context.c netconfig.c - -include Make_sources - -# for VPATH builds (invoked by configure) -mkdir-init: - DIRS=`/bin/ls $(VPATH)/modules/` - echo $(DIRS) - @for d in `/bin/ls $(VPATH)/modules/`; do \ - (mkdir -p modules/$$d ) ; \ - done - DIRS=`/bin/ls $(VPATH)/user_modules/` - echo $(DIRS) - @for d in `/bin/ls $(VPATH)/user_modules/`; do \ - (mkdir -p user_modules/$$d ) ; \ - done - mkdir locale - -svn_revision.c: ${SOURCES} - $(srcdir)/scripts/mk_svn_revision.sh - -DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d - -noinst: $(NOINST_TARGETS) - -server: $(SERVER_TARGETS) $(SERV_MODULES) - -utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS) - -.y.c: - $(YACC) $(YFLAGS) $< - mv -f y.tab.c $@ - -parsedate.o: parsedate.c - -Make_sources: modules_init.c - -Make_modules: modules_init.c - -modules_upgrade.c: modules_init.c - -SERV_OBJS = server_main.o citadel_dirs.o \ - user_ops.o citserver.o sysdep.o serv_extensions.o \ - $(DATABASE:.c=.o) domain.o \ - control.o config.o support.o room_ops.o \ - msgbase.o euidindex.o \ - locate_host.o housekeeping.o default_timezone.o \ - internet_addressing.o journaling.o \ - parsedate.o genstamp.o threads.o context.o \ - clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \ - svn_revision.o ldap.o netconfig.o - -citserver$(EXEEXT): $(SERV_OBJS) - $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT) - -%.o: %.c ${HEADERS} - echo "CC $<" - $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ - -citmail$(EXEEXT): citmail.o citadel_dirs.o - $(CC) citmail.o citadel_dirs.o \ - $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS) - -# setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris. -setup$(EXEEXT): setup.o citadel_dirs.o - $(CC) setup.o citadel_dirs.o \ - $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS) - -ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o - $(CC) ctdlmigrate.o citadel_dirs.o \ - $(LDFLAGS) -lreadline -o ctdlmigrate$(EXEEXT) $(LIBS) - -chkpwd$(EXEEXT): chkpwd.o auth.o - $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS) - -chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o - $(CC) chkpw.o auth.o citadel_dirs.o \ - $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS) - -sendcommand$(EXEEXT): sendcommand.o citadel_dirs.o $(LIBOBJS) - $(CC) sendcommand.o citadel_dirs.o \ - $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS) - -.PHONY: install-data install-doc install-exec clean cleaner distclean - -install-locale: - cd po/citadel-setup - $(MAKE) - for i in `find locale -type d | grep -v .svn` \ - ; do \ - test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \ - done - for i in `find locale -type f | grep -v .svn`; do \ - $(INSTALL) $$i $(DESTDIR)$(LOCALEDIR)/$$i; \ - done - -install: install-exec install-data install-doc install-locale - @echo - @echo Installation is complete. - @echo Now go to your Citadel directory and run 'setup'. - @echo - -install-new: install-exec-new install-data-new install-doc-new install-locale - @echo - @echo Installation is complete. - @echo Now go to your Citadel directory and run 'setup'. - @echo - -upgrade: install-exec install-doc - @echo - @echo Upgrade is complete. - @echo Now go to your Citadel directory and run 'setup'. - @echo - -install-data: - $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages - -@if test -d $(DESTDIR)/etc/pam.d; then \ - echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ - $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ - fi - -install-data-new: - $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/ - - $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages - @for i in \ - `find $(srcdir)/messages -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \ - done - -@if test -d $(DESTDIR)/etc/pam.d; then \ - echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ - $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ - fi - @for i in files; do \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \ - done - -install-doc: - @$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/docs - @for i in `find $(srcdir)/docs -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ - done - echo $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt - $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt - -install-doc-new: - @$(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR)/docs - @for i in `find $(srcdir)/docs -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ - done - @$(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR)/techdoc - @for i in `find $(srcdir)/techdoc -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ - done - $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt - -install-exec: all - @for i in files; do \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ - done - @for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \ - if test -f $$i; then \ - echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ - $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ - fi \ - done - $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/unstripped - cp $(SERVER_TARGETS) $(DESTDIR)$(prefix)/unstripped/ - - @for i in utilsmenu database_cleanup.sh ; do \ - if test -f $(srcdir)/$$i; then \ - echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ - $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ - fi \ - done - -install-exec-new: all - $(srcdir)/mkinstalldirs $(DESTDIR)/usr/sbin; - $(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin; - $(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin; - $(srcdir)/mkinstalldirs $(DESTDIR)$(UTILBIN_DIR); - $(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR); - @for i in $(SERVER_TARGETS) $(UTIL_TARGETS); do \ - if test -f $$i; then \ - echo $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \ - $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \ - fi \ - done - cp citserver $(DESTDIR)/$(UTILBIN_DIR)/citserver.unstripped - @for i in $(UTILBIN_TARGETS); do \ - if test -f $$i; then \ - echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \ - $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \ - fi \ - done - - $(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail; - @for i in utilsmenu database_cleanup.sh; do \ - if test -f $(srcdir)/$$i; then \ - echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ - $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ - fi \ - done - -clean: - rm -vfr locale/* - rm -vf *.o - rm -vf *.o ;\ - for i in $(srcdir)/modules/* ; do \ - rm -vf $$i/*.o ;\ - done - if test -d $(srcdir)/user_modules ; then \ - for i in $(srcdir)/user_modules/* ; do \ - rm -vf $$i/*.o ;\ - done \ - fi - rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) - -cleaner: clean - rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) *.la - rm -vrf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources - -distclean: cleaner - find . -name '*~' -o -name '.#*' | xargs rm -vf - rm -vf po/Makefile - rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d package-version.txt - for i in $(srcdir)/modules/* ; do \ - rm -vf $$i/*.d ;\ - done - if test -d $(srcdir)/user_modules ; then \ - for i in $(srcdir)/user_modules/* ; do \ - rm -vf $$i/*.o ;\ - done \ - fi - -.c.d: - @echo Checking dependencies for $< - @$(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@ - @test -s $@ || rm -f $@ - -Makefile: $(srcdir)/Makefile.in config.status - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status - -config.status: $(srcdir)/configure - $(SHELL) ./config.status --recheck - -$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 - cd $(srcdir) && $(AUTOCONF) - -$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4 - cd $(srcdir) && $(ACLOCAL) - -buildinfo: - echo - echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@" - echo "Compile: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ " - echo "LDFLAGS: $(LDFLAGS)" - echo - --include $(DEP_FILES) diff --git a/citadel/README.txt b/citadel/README.txt index 645249bd6..d8b1a591e 100644 --- a/citadel/README.txt +++ b/citadel/README.txt @@ -6,7 +6,8 @@ 1. Create a user on your system under which to run Citadel 2. Install supported versions of the required libraries 3. ./configure && make && make install - 4. Run the "setup" program + 4. Start up the server + 5. You can log in immediately or you can run setup * After installing Citadel, you'll probably want to install WebCit so that you can access the Citadel system using a web browser. diff --git a/citadel/configure.ac b/citadel/configure.ac deleted file mode 100644 index a6ec3f514..000000000 --- a/citadel/configure.ac +++ /dev/null @@ -1,994 +0,0 @@ - - - -FAIL FAIL FAIL - -THIS IS THE OLD CONFIGURE SCRIPT - -KEEPING IT HERE FOR REFERENCE AS WE BUILD THE NEW ONE - -DONT RUN THIS - - - - - -dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.52) - -AC_INIT([Citadel],m4_esyscmd_s([grep REV_LEVEL citadel.h | sed 's/[^0-9]*//g']),[http://uncensored.citadel.org]) - -AC_REVISION(m4_esyscmd_s([git log --pretty=%h | head -1])) - -AC_CONFIG_SRCDIR([citserver.c]) -AC_CONFIG_HEADER([sysdep.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_PREFIX_DEFAULT(/usr/local/citadel) -if test "$prefix" = NONE; then - AC_DEFINE_UNQUOTED(CTDLDIR, "$ac_default_prefix", [define this to the Citadel home directory]) - ssl_dir="$ac_default_prefix/keys" - localedir=$ac_default_prefix -else - AC_DEFINE_UNQUOTED(CTDLDIR, "$prefix", [define this to the Citadel home directory]) - ssl_dir="$prefix/keys" - localedir=$prefix -fi - -dnl Make sure we see all GNU and Solaris extensions. -AC_GNU_SOURCE - - -dnl Checks for the Datadir -AC_ARG_WITH(datadir, - [ --with-datadir directory to store the databases under], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_DATA_DIR,[],[use alternate database location?]) - AC_DEFINE_UNQUOTED(DATA_DIR, "$withval",[define, if the user suplied a data-directory to use.]) - MAKE_DATA_DIR=$withval - AC_SUBST(MAKE_DATA_DIR) - fi - ] -) - - -dnl Checks for the helpDatadir -AC_ARG_WITH(helpdir, - [ --with-helpdir directory to store the helpfiles under], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_HELP_DIR,[],[use alternate database location?]) - AC_DEFINE_UNQUOTED(HELP_DIR, "$withval",[define, if the user suplied a helpfile-directory to use.]) - MAKE_HELP_DIR=$withval - AC_SUBST(MAKE_HELP_DIR) - fi - ] -) - -dnl Checks for the Static Datadir -AC_ARG_WITH(staticdatadir, - [ --with-staticdatadir directory to store citadels system messages under], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_STATICDATA_DIR, [], [should we activate an alternate static text location?]) - AC_DEFINE_UNQUOTED(STATICDATA_DIR, "$withval", [where do we put our static text data?]) - MAKE_STATICDATA_DIR=$withval - AC_SUBST(MAKE_STATICDATA_DIR) - fi - ] -) - - -dnl Checks for the SSLdir -dnl this is a bit different than the rest, -dnl because of the citadel used to have a keys/ subdir. -AC_ARG_WITH(ssldir, - [ --with-ssldir directory to store the ssl certificates under], - [ if test "x$withval" != "xno" ; then - - ssl_dir="$withval" - fi - AC_SUBST(MAKE_SSL_DIR) - ] -) -AC_DEFINE_UNQUOTED(SSL_DIR, "$ssl_dir", [were should we put our keys?]) - - -dnl Checks for the spooldir -AC_ARG_WITH(spooldir, - [ --with-spooldir directory to keep queues under], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_SPOOL_DIR, [], [enable alternate spool dir?]) - AC_DEFINE_UNQUOTED(SPOOL_DIR,"$withval", [where do we place our spool dirs?]) - MAKE_SPOOL_DIR=$withval - AC_SUBST(MAKE_SPOOL_DIR) - fi - ] -) - - -dnl Checks for the Configdir -AC_ARG_WITH(sysconfdir, - [ --with-sysconfdir directory to store the configs under], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_ETC_DIR, [], [should we search our system config in an alternate place?]) - AC_DEFINE_UNQUOTED(ETC_DIR, "$withval", [where to search our config files]) - MAKE_ETC_DIR=$withval - AC_SUBST(MAKE_ETC_DIR) - fi - ] -) - -dnl Checks for the Configdir -AC_ARG_WITH(autosysconfdir, - [ --with-autosysconfdir directory to store the automaticaly maintained configs under], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_AUTO_ETC_DIR, [], [should we search our automatic config in an alternate place?]) - AC_DEFINE_UNQUOTED(AUTO_ETC_DIR, "$withval", [where to search our automatic config files]) - MAKE_AUTO_ETC_DIR=$withval - AC_SUBST(MAKE_AUTO_ETC_DIR) - fi - ] -) - -dnl Checks for where to put our utilities -AC_ARG_WITH(utility-bindir, - [ --with-utility-bindir directory where to find helper binaries], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_UTILBIN_DIR,[],[should we put our helper binaries to another location?]) - AC_DEFINE_UNQUOTED(UTILBIN_DIR, "$withval", [were to put our helper programs]) - MAKE_UTILBIN_DIR=$withval - AC_SUBST(MAKE_UTILBIN_DIR) - fi - ] -) - - -dnl Checks for the run-dir for the sockets -AC_ARG_WITH(rundir, - [ --with-rundir directory to place runtime files (UDS) to?], - [ if test "x$withval" != "xno" ; then - AC_DEFINE(HAVE_RUN_DIR, [], [should we put our non volatile files elsewhere?]) - AC_DEFINE_UNQUOTED(RUN_DIR, "$withval", [define, where the config should go in unix style]) - MAKE_RUN_DIR=$withval - AC_SUBST(MAKE_RUN_DIR) - fi - ] -) - - -AC_ARG_WITH(docdir, - [ --with-docdir where to install the documentation. default: /usr/local/citadel/], - [ if test "x$withval" != "xno" ; then - MAKE_DOC_DIR=$withval - AC_SUBST(MAKE_DOC_DIR) - fi - ] -) - -dnl where to put the locale files -AC_ARG_WITH(localedir, - [ --with-localedir directory to put the locale files to], - [ if test "x$withval" != "xno" ; then - localedir=$withval - fi - ] -) -AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir",[where to find our pot files]) -LOCALEDIR=$localedir -AC_SUBST(LOCALEDIR) - - - -dnl Checks for the zlib compression library. -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $SERVER_LIBS" -AC_CHECK_HEADER(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ - LIBS="-lz $LIBS $SERVER_LIBS" - ], - [ - AC_MSG_ERROR(zlib was not found or is not usable. Please install zlib.) - ] - , - )], - [ - AC_MSG_ERROR(zlib.h was not found or is not usable. Please install zlib.) - ] -) -CFLAGS="$saved_CFLAGS" - -dnl Checks for the crypt_r function -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $SERVER_LIBS" -AC_CHECK_HEADER(crypt.h, - [AC_CHECK_LIB(crypt, crypt_r, - [ - SERVER_LIBS="-lcrypt $SERVER_LIBS" - ], - [ - AC_MSG_ERROR(crypt_r was not found or is not usable.) - ] - , - )], - [ - AC_MSG_ERROR(crypt.h was not found or is not usable.) - ] -) -CFLAGS="$saved_CFLAGS" - -dnl Here is the check for a libc integrated iconv -AC_ARG_ENABLE(iconv, - [ --disable-iconv do not use iconv charset conversion], - ok_iconv=no, ok_iconv=yes) - -AC_MSG_CHECKING(Checking to see if your system supports iconv) -AC_TRY_RUN([ - #include - main() { - iconv_t ic = (iconv_t)(-1) ; - ic = iconv_open("UTF-8", "us-ascii"); - iconv_close(ic); - exit(0); - } - ], - [ - ok_iconv=yes - AC_MSG_RESULT([yes]) - ], - [ - ok_iconv=no - AC_MSG_RESULT([no]) - ] -) - -dnl Check for iconv in external libiconv -if test "$ok_iconv" = no; then - AC_MSG_CHECKING(Checking for an external libiconv) - OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -liconv" - AC_TRY_RUN([ - #include - main() { - iconv_t ic = (iconv_t)(-1) ; - ic = iconv_open("UTF-8", "us-ascii"); - iconv_close(ic); - } - ], - [ - ok_iconv=yes - AC_MSG_RESULT([yes]) - ], - [ - ok_iconv=no - LDFLAGS="$OLD_LDFLAGS" - AC_MSG_RESULT([no]) - ] - ) -fi - -if test "$ok_iconv" != "no"; then - AC_MSG_RESULT(Citadel will be built with character set conversion.) - AC_DEFINE(HAVE_ICONV,[],[whether we have iconv for charset conversion]) -else - AC_MSG_RESULT(Citadel will be built without character set conversion.) -fi - -AC_CHECK_LIB(intl, libintl_bindtextdomain, [LDFLAGS="$LDFLAGS -lintl"]) - -AC_ARG_ENABLE(pie, [ --enable-pie build position-independent executables]) - -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)]) -AC_ARG_WITH(db, [ --with-db@<:@=DIR@:>@ use Berkeley DB 3.x @<:@DIR=/usr/local/BerkeleyDB.3.@<:@123@:>@@:>@]) -AC_ARG_WITH(ssl, - [ --with-ssl=PATH Specify path to OpenSSL installation ], - [ - if test "x$withval" != "xno" ; then - tryssldir=$withval - fi - ] -) - -if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then - db_dir="$with_db" - with_db=yes -else - test -f /usr/local/lib/libdb.a -o -f /usr/local/lib/libdb.so \ - && db_dir=/usr/local -fi - -AC_CANONICAL_HOST -PTHREAD_DEFS=-D_REENTRANT -AC_MSG_CHECKING([how to compile with POSIX threads]) -case "$host" in - dnl BSDI 3.0 wants relocatable object modules instead of shared libs - dnl for dlopen(), and has a wrapper script to link with shared libs. - dnl Also has stupid non-reentrant gethostbyaddr() and friends. - *-*-bsdi[123]*) - test -z "$CC" -a -x /usr/bin/shlicc2 && CC=shlicc2 - AC_DEFINE(HAVE_NONREENTRANT_NETDB,[], [define this if the OS has broken non-reentrant gethostby{name,addr}() ]) - AC_MSG_RESULT([Old BSDI]) - ;; - *-*-bsdi*) - AC_DEFINE(HAVE_NONREENTRANT_NETDB, [], [define this if the OS has broken non-reentrant gethostby{name,addr}() ]) - AC_MSG_RESULT([BSD/OS]) - ;; - dnl Curses support on Mac OS X is kind of screwed at the moment. - dnl TCP buffering isn't ideal under OS X. This define should also be - dnl checked in other cases of OS X-Linux differences. - *-*-darwin*) - AC_DEFINE(HAVE_DARWIN, [], [define if using OS X/Darwin]) - AC_MSG_RESULT([Mac OS X]) - ;; - dnl Digital Unix has an odd way to build for pthreads, and we can't - dnl build pthreads programs with gcc due to header problems. - alpha*-dec-osf*) - test -z "$CC" && CC=cc - LIBS="-lpthread -lexc $LIBS" - check_pthread=no - AC_MSG_RESULT([Tru64 or Digital UNIX]) - ;; - dnl FreeBSD is similar to Digital UNIX with DEC C, which has a -pthread flag: - *-*-freebsd*) - if test "$with_kthread" = yes; then - LIBS="-kthread $LIBS" - else - LIBS="-pthread $LIBS" - fi - check_pthread=no - PTHREAD_DEFS=-D_THREAD_SAFE - AC_MSG_RESULT([FreeBSD]) - ;; - *-*-openbsd*) - LIBS="-pthread $LIBS" - check_pthread=no - PTHREAD_DEFS=-pthread - AC_MSG_RESULT([OpenBSD]) - ;; - *-*-linux*) - PTHREAD_DEFS="-D_REENTRANT -pthread" - AC_MSG_RESULT([Linux]) - ;; - *-*-solaris*) - PTHREAD_DEFS="-D_REENTRANT -D_PTHREADS" - AC_MSG_RESULT([Solaris]) - ;; - *-*-cygwin*) - SERVER_LDFLAGS="-Wl,-subsystem,windows" - AC_MSG_RESULT([Cygwin]) - ;; - *) - AC_MSG_RESULT([default]) - ;; -esac -dnl DEFS="$DEFS $PTHREAD_DEFS" - - -dnl Checks for programs. -AC_PROG_CC - - - -dnl Set up system-dependent compiler flags. -if test "$GCC" = yes; then - if test "$CC" = icc; then - CFLAGS="$CFLAGS -w1" - else - case "$host" in - *-*-solaris*|alpha*-dec-osf*) - CFLAGS="$CFLAGS -Wall -Wcast-qual -Wcast-align -Wno-char-subscripts $PTHREAD_DEFS" - ;; - *) - CFLAGS="$CFLAGS -Wall -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-strict-aliasing $PTHREAD_DEFS" - ;; - esac - fi -fi - -if test "x$enable_pie" = xyes; then - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS -fpie" - LDFLAGS="$LDFLAGS -pie -fpie" - AC_CACHE_CHECK([whether compiler accepts -pie -fpie], ac_cv_pie_fpie, - [AC_TRY_LINK([], [], - ac_cv_pie_fpie=yes, ac_cv_pie_fpie=no)]) - if test $ac_cv_pie_fpie = no; then - CFLAGS="$save_CFLAGS" - LDFLAGS="$save_LDFLAGS" - fi -fi - -AC_MSG_CHECKING([how to create dependancy checks]) - if test -n "`$CC -V 2>&1 |grep Sun`"; then - DEPEND_FLAG=-xM; - else - DEPEND_FLAG=-M - fi -AC_SUBST(DEPEND_FLAG) - - -AC_PROG_INSTALL -AC_PROG_YACC -AC_PATH_PROG(DIFF,diff) -AC_PATH_PROG(PATCH,patch) -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) - -dnl Checks for system services. - -dnl Check the size of various builtin types; see typesize.h (error) -AC_CHECK_SIZEOF(char, 0) -AC_CHECK_SIZEOF(short, 0) -AC_CHECK_SIZEOF(int, 0) -AC_CHECK_SIZEOF(long, 0) -AC_CHECK_SIZEOF(size_t, 0) -AC_CHECK_SIZEOF(loff_t, 0) -dnl AC_CHECK_SIZEOF(long long, 0) - -dnl Checks for libraries. - -dnl We want to test for the following in libc before checking for their -dnl respective libraries, because some systems (like Irix) have both, and the -dnl non-libc versions may be broken. -AC_CHECK_FUNCS(crypt gethostbyname connect getpwnam_r getpwuid_r getloadavg) - -AC_CHECK_FUNCS(strftime_l uselocale gettext) - -if test "$ok_nls" != "no"; then - AC_CHECK_PROG(ok_xgettext, xgettext, yes, no) - ok_nls=$ok_xgettext -fi - -if test "$ok_nls" != "no"; then - AC_CHECK_PROG(ok_msgmerge, msgmerge, yes, no) - ok_nls=$ok_msgmerge -fi - -if test "$ok_nls" != "no"; then - AC_CHECK_PROG(ok_msgfmt, msgfmt, yes, no) - ok_nls=$ok_msgfmt -fi - -if test "$ok_nls" != "no"; then - AC_MSG_RESULT(citadel will be built with national language support.) - AC_DEFINE(ENABLE_NLS, [], [whether we have NLS support]) - PROG_SUBDIRS="$PROG_SUBDIRS po/citadel-setup" -else - AC_MSG_RESULT(citadel will be built without national language support.) -fi - -dnl disable backtrace if we don't want it. -AC_ARG_WITH(backtrace, - [ --with-backtrace enable backtrace dumps in the syslog], - [ if test "x$withval" != "xno" ; then - CFLAGS="$CFLAGS -rdynamic " - LDFLAGS="$LDFLAGS -rdynamic " - SERVER_LDFLAGS="$SERVER_LDFLAGS -rdynamic " - AC_CHECK_FUNCS(backtrace) - fi - ] -) - -dnl disable backtrace if we don't want it. -AC_ARG_WITH(gprof, - [ --with-gprof enable profiling], - [ if test "x$withval" != "xno" ; then - CFLAGS="$CFLAGS -pg " - LDFLAGS="$LDFLAGS -pg " - SERVER_LDFLAGS="$SERVER_LDFLAGS -pg " - fi - ] -) - -if test "$ac_cv_func_gethostbyname" = no; then - AC_CHECK_LIB(nsl, gethostbyname) -fi - -if test "$ac_cv_func_connect" = no; then - AC_CHECK_LIB(socket, connect) -fi - -dnl Check for Solaris realtime support -AC_CHECK_LIB(rt, sched_yield) - -dnl Determine the system's authentication capabilities. -dnl We currently support PAM, standard getpwnam(), and getspnam() -dnl (Linux shadow passwords) - -save_LIBS=$LIBS -AC_CHECK_LIB(pam, pam_start, [chkpwd_LIBS="-lpam $chkpwd_LIBS" - LIBS="-lpam $LIBS"]) -AC_CHECK_FUNCS(pam_start) -test "$enable_chkpwd" != no && LIBS=$save_LIBS - if test "$ac_cv_func_pam_start" = no -o "$with_pam" != yes; then - save_LIBS=$LIBS - AC_SEARCH_LIBS(getspnam, shadow, [ - if test "$ac_cv_search_getspnam" = -lshadow; then - chkpwd_LIBS="-lshadow $chkpwd_LIBS" - fi]) - test "$enable_chkpwd" != no && LIBS=$save_LIBS - if test "$ac_cv_func_crypt" = no; then - AC_CHECK_LIB(crypt, crypt, [ - chkpwd_LIBS="-lcrypt $chkpwd_LIBS" - test "$enable_chkpwd" = no && \ - LIBS="-lcrypt $LIBS"]) - fi - fi - -AC_CHECK_FUNCS(vw_printw wcolor_set resizeterm wresize) - -dnl Check for libpthread(s) if we're not using Digital UNIX or FreeBSD. (On -dnl which the -pthread flag takes care of this.) -if test "$check_pthread" != no; then - AC_CHECK_LIB(pthread, pthread_create) - AC_CHECK_LIB(pthreads, pthread_create) -fi - -test -d /usr/kerberos/include && CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" - -dnl Checks for the libical iCalendar library. -AC_CHECK_HEADER(libical/ical.h, - [AC_CHECK_LIB(ical, icaltimezone_set_tzid_prefix, - [ - SERVER_LIBS="-lical $SERVER_LIBS" - ], - [ - AC_MSG_ERROR(libical was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] - , - )], - [ - AC_MSG_ERROR(libical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] -) - - -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $SERVER_LIBS" -dnl Check for libcitadel -AC_CHECK_HEADER(libcitadel.h, - [AC_CHECK_LIB(citadel, libcitadel_version_string, - [ - LIBS="-lcitadel $LIBS $SERVER_LIBS" - chkpwd_LIBS="-lcitadel $chkpwd_LIBS" - ], - [ - AC_MSG_ERROR(libcitadel was not found or is not usable. Please install libcitadel.) - ] - , - )], - [ - AC_MSG_ERROR(libcitadel.h was not found or is not usable. Please install libcitadel.) - ] -) -CFLAGS="$saved_CFLAGS" - - -# The big search for OpenSSL -if test "$with_ssl" != "no"; then - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" - saved_CFLAGS="$CFLAGS" - if test "x$prefix" != "xNONE"; then - tryssldir="$tryssldir $prefix" - fi - AC_CACHE_CHECK([for OpenSSL], ac_cv_openssldir, [ - for ssldir in $tryssldir "" /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do - CFLAGS="$saved_CFLAGS" - LDFLAGS="$saved_LDFLAGS" - LIBS="$saved_LIBS -lssl -lcrypto" - - # Skip directories if they don't exist - if test ! -z "$ssldir" -a ! -d "$ssldir" ; then - continue; - fi - if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then - # Try to use $ssldir/lib if it exists, otherwise - # $ssldir - if test -d "$ssldir/lib" ; then - LDFLAGS="-L$ssldir/lib $saved_LDFLAGS" - if test ! -z "$need_dash_r" ; then - LDFLAGS="-R$ssldir/lib $LDFLAGS" - fi - else - LDFLAGS="-L$ssldir $saved_LDFLAGS" - if test ! -z "$need_dash_r" ; then - LDFLAGS="-R$ssldir $LDFLAGS" - fi - fi - # Try to use $ssldir/include if it exists, otherwise - # $ssldir - if test -d "$ssldir/include" ; then - CFLAGS="-I$ssldir/include $saved_CFLAGS" - else - CFLAGS="-I$ssldir $saved_CFLAGS" - fi - fi - - # Basic test to check for compatible version and correct linking - # *does not* test for RSA - that comes later. - AC_TRY_RUN( - [ - #include - #include - int main(void) - { - char a[2048]; - memset(a, 0, sizeof(a)); - RAND_add(a, sizeof(a), sizeof(a)); - return(RAND_status() <= 0); - } - ], - [ - found_crypto=1 - break; - ], [] - ) - - if test ! -z "$found_crypto" ; then - break; - fi - done - - if test -z "$ssldir" ; then - ssldir="(system)" - fi - - if test ! -z "$found_crypto" ; then - ac_cv_openssldir=$ssldir - else - ac_cv_openssldir="no" - fi - ]) - LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" - CFLAGS="$saved_CFLAGS" - - if test "x$ac_cv_openssldir" != "xno" ; then - AC_DEFINE(HAVE_OPENSSL, [], [Define if you have OpenSSL.]) - LIBS="-lssl -lcrypto $LIBS" - dnl Need to recover ssldir - test above runs in subshell - ssldir=$ac_cv_openssldir - if test ! -z "$ssldir" -a "x$ssldir" != "x/usr" -a "x$ssldir" != "x(system)"; then - # Try to use $ssldir/lib if it exists, otherwise - # $ssldir - if test -d "$ssldir/lib" ; then - LDFLAGS="-L$ssldir/lib $saved_LDFLAGS" - if test ! -z "$need_dash_r" ; then - LDFLAGS="-R$ssldir/lib $LDFLAGS" - fi - else - LDFLAGS="-L$ssldir $saved_LDFLAGS" - if test ! -z "$need_dash_r" ; then - LDFLAGS="-R$ssldir $LDFLAGS" - fi - fi - # Try to use $ssldir/include if it exists, otherwise - # $ssldir - if test -d "$ssldir/include" ; then - CFLAGS="-I$ssldir/include $saved_CFLAGS" - else - CFLAGS="-I$ssldir $saved_CFLAGS" - fi - fi - fi -fi - -if test "x$with_db" != xno; then - test "$db_dir" && LDFLAGS="$LDFLAGS -L$db_dir/lib" - - dblib="" - - if test "$db_dir"; then - CPPFLAGS="$CPPFLAGS -I$db_dir/include" - fi - - - AC_CHECK_DB([db], - [ - DATABASE=database.c - ], - AC_MSG_ERROR([[Can not locate a suitable Berkeley DB - library. Use --with-db=PATH to specify - the path]])) - -fi - - -dnl Checks for the OpenLDAP client library. -AC_CHECK_HEADER(ldap.h, - [AC_CHECK_LIB(ldap, ldap_initialize, - [ - SERVER_LIBS="-lldap $SERVER_LIBS" - ], - [ - AC_MSG_ERROR(OpenLDAP development library was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] - , - )], - [ - AC_MSG_ERROR(OpenLDAP development headers were not found and are required. More info: http://www.citadel.org/doku.php/installation:start) - ] -) - - -dnl Checks for the Expat XML parser. -AC_CHECK_HEADER(expat.h, - [AC_CHECK_LIB(expat, XML_ParserCreateNS, - [ - SERVER_LIBS="-lexpat $SERVER_LIBS" - ], - [ - AC_MSG_ERROR(The Expat XML parser was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] - , - )], - [ - AC_MSG_ERROR(expat.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] -) - - -dnl Checks for libcurl. -AC_CHECK_HEADER(curl/curl.h, - [AC_CHECK_LIB(curl, curl_version, - [ - SERVER_LIBS="-lcurl $SERVER_LIBS" - ], - [ - AC_MSG_ERROR(libcurl was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] - , - )], - [ - AC_MSG_ERROR(curl/curl.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start) - ] -) - - -dnl Checks for header files. -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_SYS_WAIT - -dnl -dnl TODO: for the DB header checks, we should check whether the headers -dnl define db_env_create, somehow -dnl -AC_CHECK_HEADERS(dl.h fcntl.h limits.h malloc.h termios.h sys/ioctl.h sys/select.h sys/stat.h sys/time.h sys/prctl.h syslog.h unistd.h utmp.h utmpx.h paths.h db.h pthread.h netinet/in.h arpa/nameser.h arpa/nameser_compat.h syscall.h sys/syscall.h) - -AC_CHECK_HEADER(resolv.h,AC_DEFINE(HAVE_RESOLV_H, [], [define this if you have the resolv.h header file.]),, -[#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_NAMESER_H -#include -#endif]) - - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_HEADER_TIME - -dnl defined in acinclude.m4: -CIT_STRUCT_TM - -AC_CACHE_CHECK([for ut_type in struct utmp], ac_cv_struct_ut_type, -[AC_TRY_COMPILE([#include -#include ], [struct utmp ut; ut.ut_type;], -ac_cv_struct_ut_type=yes, ac_cv_struct_ut_type=no)]) -if test $ac_cv_struct_ut_type = yes; then - AC_DEFINE(HAVE_UT_TYPE, [], [define this if struct utmp has an ut_type member]) -fi - -AC_CACHE_CHECK( - [for call semantics from getpwuid_r], - ac_cv_call_getpwuid_r, - [AC_TRY_COMPILE([#include -#include ], - [ - struct passwd pw, *pwp; - char pwbuf[64]; - uid_t uid; - - getpwuid_r(uid, &pw, pwbuf, sizeof(pwbuf), &pwp); - ], - ac_cv_call_getpwuid_r=yes, - ac_cv_call_getpwuid_r=no) - ]) - -if test $ac_cv_call_getpwuid_r = no; then - AC_DEFINE(SOLARIS_GETPWUID,[],[do we need to use solaris call syntax?]) - AC_DEFINE(F_UID_T, "%ld", [whats the matching format string for uid_t?]) - AC_DEFINE(F_PID_T, "%ld", [whats the matching format string for pid_t?]) - AC_DEFINE(F_XPID_T, "%lx", [whats the matching format string for xpid_t?]) -else - AC_DEFINE(F_UID_T, "%d", [whats the matching format string for uid_t?]) - AC_DEFINE(F_PID_T, "%d", [whats the matching format string for pid_t?]) - AC_DEFINE(F_XPID_T, "%x", [whats the matching format string for xpid_t?]) -fi - - -dnl Our own happy little check for the resolver library. - -case "`uname -a`" in - OpenBSD*) - echo "we don't need to check for resolv on openbsd" - ;; - FreeBSD*) - echo "we don't need to check for resolv on freeBSD" - ;; - *) - test -f /usr/local/lib/libresolv.a && LDFLAGS="$LDFLAGS -L/usr/local/lib" - AC_CHECK_LIB(resolv, res_query, - RESOLV="$RESOLV -lresolv", - [dnl Have to include resolv.h as res_query is sometimes defined as a macro - AC_MSG_CHECKING([for res_query in -lresolv (with resolv.h if present)]) - saved_libs="$LIBS" - LIBS="-lresolv $LIBS" - AC_TRY_LINK([ - #ifdef HAVE_RESOLV_H - #include - #endif], - [res_query(0,0,0,0,0)], - [AC_MSG_RESULT(yes) - have_res_query=yes], - [AC_MSG_RESULT(no) - AC_MSG_ERROR(libresolv was not found. Citadel requires the resolver library.) - ]) - ] - ) - ;; -esac - - - -AC_CACHE_CHECK([for ut_host in struct utmp], ac_cv_struct_ut_host, -[AC_TRY_COMPILE([#include -#include ], [struct utmp ut; ut.ut_host;], -ac_cv_struct_ut_host=yes, ac_cv_struct_ut_host=no)]) -if test $ac_cv_struct_ut_host = yes; then - AC_DEFINE(HAVE_UT_HOST, [], [define this if struct utmp has an ut_host member]) -fi - -dnl Checks for library functions. -AC_FUNC_GETPGRP -AC_PROG_GCC_TRADITIONAL -AC_TYPE_SIGNAL -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(getspnam getutxline mkdir mkfifo mktime rmdir select socket strerror strcasecmp strncasecmp) - -dnl Now check for pthreads - -dnl On some platforms, AC_CHECK_FUNC[S] doesn't work for pthreads programs; -dnl we need to include pthread.h - -AC_CACHE_CHECK([for pthread_cancel], ac_cv_func_pthread_cancel, -[AC_TRY_LINK([#include ], -[ pthread_t thread; - - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_cancel) || defined (__stub___pthread_cancel) - choke me -#else - pthread_cancel(thread); -#endif], -ac_cv_func_pthread_cancel=yes, ac_cv_func_pthread_cancel=no)]) -if test "$ac_cv_func_pthread_cancel" = yes; then - AC_DEFINE(HAVE_PTHREAD_CANCEL, [], [define this if you have the pthread_cancel() function]) -fi - -AC_CACHE_CHECK([for pthread_create], ac_cv_func_pthread_create, -[AC_TRY_LINK([#include ], -[ /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_cancel) || defined (__stub___pthread_cancel) - choke me -#else - pthread_create(NULL, NULL, NULL, NULL); -#endif], -ac_cv_func_pthread_create=yes, ac_cv_func_pthread_create=no)]) -if test "$ac_cv_func_pthread_create" = yes; then - test "$DATABASE" && TARGETS="server utils" -fi - -AC_CACHE_CHECK([the weather], ac_cv_weather, [ - sleep 1 - echo $ECHO_N "opening your window... $ECHO_C" >&6 - sleep 2 - month=`date | cut -f 2 -d ' '` - case $month in - Dec | Jan | Feb) - ac_cv_weather="it's cold!" - ;; - Mar | Apr) - ac_cv_weather="it's wet!" - ;; - Jul | Aug) - ac_cv_weather="it's hot!" - ;; - Oct | Nov) - ac_cv_weather="it's cool" - ;; - May | Jun | Sep | *) - ac_cv_weather="it's fine" - ;; - esac - ]) - - -AC_CACHE_CHECK([under the bed], ac_cv_under_the_bed, [ - number=`date | cut -c 19` - case $number in - 7) - ac_cv_under_the_bed="lunatics and monsters found" - ;; - *) - ac_cv_under_the_bed="dust bunnies found" - ;; - esac - ]) - - -STRUCT_UCRED - -dnl Done! Now write the Makefile and sysdep.h -AC_SUBST(RESOLV) -AC_SUBST(chkpwd_LIBS) -AC_SUBST(TARGETS) -AC_SUBST(DATABASE) -AC_SUBST(SERVER_LDFLAGS) -AC_SUBST(SERVER_LIBS) -AC_SUBST(SETUP_LIBS) -AC_SUBST(DIFF) -AC_SUBST(PATCH) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT(po/citadel-setup/Makefile) - -if test -z "$DATABASE"; then - AC_MSG_WARN([No database driver was found. Please install Berkeley DB.]) -fi - -abs_srcdir="`cd $srcdir && pwd`" -abs_builddir="`pwd`" -if test "$abs_srcdir" != "$abs_builddir"; then - ln -sf $abs_srcdir/include $abs_builddir - ln -sf $abs_srcdir/Make_sources $abs_builddir - ln -sf $abs_srcdir/Make_modules $abs_builddir - for i in $abs_srcdir/*.h ; do - if test "$abs_srcdir/sysdep.h" != "$i"; then - ln -sf $i $abs_builddir - fi - done - for d in `/bin/ls $abs_srcdir/modules/`; do - (mkdir -p $abs_builddir/modules/$d) - done - if test -d "$abs_srcdir/user_modules/"; then - for d in `/bin/ls $abs_srcdir/user_modules/`; do - (mkdir -p $abs_builddir/user_modules/$d) - done - fi - mkdir -p $abs_builddir/utils - mkdir -p $abs_builddir/utillib -fi - -if test -n "$srcdir"; then - export srcdir=. -fi - - -echo ------------------------------------------------------------------------ -echo 'Character set conversion support:' $ok_iconv -echo -echo 'Note: if you are not using Linux, make sure you are using GNU make' -echo '(gmake) to compile Citadel.' -echo diff --git a/citadel/COPYING b/citadel/license.txt similarity index 100% rename from citadel/COPYING rename to citadel/license.txt diff --git a/citadel/mkinstalldirs b/citadel/mkinstalldirs deleted file mode 100755 index f945dbf2b..000000000 --- a/citadel/mkinstalldirs +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" 1>&2 - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/citadel/server/citadel_dirs.h b/citadel/server/citadel_dirs.h index f4c2b6c6f..95cf32511 100644 --- a/citadel/server/citadel_dirs.h +++ b/citadel/server/citadel_dirs.h @@ -38,8 +38,8 @@ #define file_pid_paniclog "panic.log" #define file_crpt_file_key "keys/citadel.key" #define file_crpt_file_cer "keys/citadel.cer" -#define file_chkpwd "chkpwd" -#define file_guesstimezone "guesstimezone.sh" +#define file_chkpwd CTDLDIR "chkpwd" +#define file_guesstimezone CTDLDIR "guesstimezone.sh" // externs diff --git a/citadel/server/modules/autocompletion/.gitignore b/citadel/server/modules/autocompletion/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/autocompletion/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/bio/.gitignore b/citadel/server/modules/bio/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/bio/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/bio/serv_bio.c b/citadel/server/modules/bio/serv_bio.c index cf3823210..6ccce90c1 100644 --- a/citadel/server/modules/bio/serv_bio.c +++ b/citadel/server/modules/bio/serv_bio.c @@ -1,33 +1,23 @@ -/* - * This module implements server commands related to the display and - * manipulation of user "bio" files. - * - * Copyright (c) 1987-2022 by the citadel.org team - * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "../../ctdl_module.h" -#include "../../config.h" +// This module implements server commands related to the display and +// manipulation of user profiles (also known as "bio" files). +// +// Copyright (c) 1987-2022 by the citadel.org team +// +// This program is open source software. Use, duplication, or disclosure +// is subject to the terms of the GNU General Public License, version 3. +// The program is distributed without any warranty, expressed or implied. #include #include #include +#include "../../ctdl_module.h" +#include "../../config.h" + -/* - * Command to enter user bio (profile) in plain text. - * This is deprecated , or at least it will be when its replacement is written :) - * I want commands to get/set bio in full MIME wonderfulness. - */ +// Command to enter user bio (profile) in plain text. +// This is deprecated , or at least it will be when its replacement is written :) +// I want commands to get/set bio in full MIME wonderfulness. void cmd_ebio(char *cmdbuf) { char buf[SIZ]; @@ -46,7 +36,7 @@ void cmd_ebio(char *cmdbuf) { StrBufAppendBufPlain(NewProfile, HKEY("\n"), 0); } - /* we have read the new profile from the user , now save it */ + // we have read the new profile from the user , now save it long old_msgnum = CC->user.msgnum_bio; char userconfigroomname[ROOMNAMELEN]; CtdlMailboxName(userconfigroomname, sizeof userconfigroomname, &CC->user, USERCONFIGROOM); @@ -62,13 +52,10 @@ void cmd_ebio(char *cmdbuf) { } -/* - * Command to read user bio (profile) in plain text. - * This is deprecated , or at least it will be when its replacement is written :) - * I want commands to get/set bio in full MIME wonderfulness. - */ -void cmd_rbio(char *cmdbuf) -{ +// Command to read user bio (profile) in plain text. +// This is deprecated , or at least it will be when its replacement is written :) +// I want commands to get/set bio in full MIME wonderfulness. +void cmd_rbio(char *cmdbuf) { struct ctdluser ruser; char buf[SIZ]; @@ -91,11 +78,8 @@ void cmd_rbio(char *cmdbuf) } -/* - * Import function called by import_old_bio_files() for a single user - */ -void import_one_bio_file(char *username, long usernum, char *path) -{ +// Import function called by import_old_bio_files() for a single user +void import_one_bio_file(char *username, long usernum, char *path) { syslog(LOG_DEBUG, "Import legacy bio for %s, usernum=%ld, filename=%s", username, usernum, path); FILE *fp = fopen(path, "r"); @@ -139,11 +123,8 @@ void import_one_bio_file(char *username, long usernum, char *path) } -/* - * Look for old-format "bio" files and import them into the message base - */ -void import_old_bio_files(void) -{ +// Look for old-format "bio" files and import them into the message base +void import_old_bio_files(void) { DIR *filedir = NULL; struct dirent *filedir_entry; size_t d_namelen; @@ -153,14 +134,12 @@ void import_old_bio_files(void) struct stat s; char path[PATH_MAX]; - syslog(LOG_DEBUG, "Importing old style bio files into the message base"); filedir = opendir("bio"); if (filedir == NULL) { return; } - while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL)) - { + while ( (filedir_entry = readdir(filedir)) , (filedir_entry != NULL)) { #ifdef _DIRENT_HAVE_D_NAMLEN d_namelen = filedir_entry->d_namlen; @@ -222,6 +201,6 @@ char *ctdl_module_init_bio(void) { CtdlRegisterProtoHook(cmd_ebio, "EBIO", "Enter your bio"); CtdlRegisterProtoHook(cmd_rbio, "RBIO", "Read a user's bio"); } - /* return our module name for the log */ + // return our module name for the log return "bio"; } diff --git a/citadel/server/modules/calendar/.gitignore b/citadel/server/modules/calendar/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/calendar/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/checkpoint/.gitignore b/citadel/server/modules/checkpoint/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/checkpoint/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/clamav/.gitignore b/citadel/server/modules/clamav/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/clamav/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/crypto/.gitignore b/citadel/server/modules/crypto/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/crypto/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/expire/.gitignore b/citadel/server/modules/expire/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/expire/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/fulltext/.gitignore b/citadel/server/modules/fulltext/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/fulltext/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/imap/.gitignore b/citadel/server/modules/imap/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/imap/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/inboxrules/.gitignore b/citadel/server/modules/inboxrules/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/inboxrules/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/inetcfg/.gitignore b/citadel/server/modules/inetcfg/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/inetcfg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/instmsg/.gitignore b/citadel/server/modules/instmsg/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/instmsg/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/listsub/.gitignore b/citadel/server/modules/listsub/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/listsub/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/migrate/.gitignore b/citadel/server/modules/migrate/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/migrate/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/newuser/.gitignore b/citadel/server/modules/newuser/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/newuser/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/notes/.gitignore b/citadel/server/modules/notes/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/notes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/openid/.gitignore b/citadel/server/modules/openid/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/openid/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/pop3/.gitignore b/citadel/server/modules/pop3/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/pop3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/pop3client/.gitignore b/citadel/server/modules/pop3client/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/pop3client/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/roomchat/.gitignore b/citadel/server/modules/roomchat/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/roomchat/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/rssclient/.gitignore b/citadel/server/modules/rssclient/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/rssclient/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/rwho/.gitignore b/citadel/server/modules/rwho/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/rwho/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/smtp/.gitignore b/citadel/server/modules/smtp/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/smtp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/spam/.gitignore b/citadel/server/modules/spam/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/spam/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/test/.gitignore b/citadel/server/modules/test/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/test/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/upgrade/.gitignore b/citadel/server/modules/upgrade/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/upgrade/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/vcard/.gitignore b/citadel/server/modules/vcard/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/vcard/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/wiki/.gitignore b/citadel/server/modules/wiki/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/wiki/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules/xmpp/.gitignore b/citadel/server/modules/xmpp/.gitignore deleted file mode 100644 index 5761abcfd..000000000 --- a/citadel/server/modules/xmpp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.o diff --git a/citadel/server/modules_init.c b/citadel/server/modules_init.c index 966c769fc..9fdb98c59 100644 --- a/citadel/server/modules_init.c +++ b/citadel/server/modules_init.c @@ -26,50 +26,50 @@ int threading = 0; void initialize_modules(int is_threading) { threading = is_threading; - syslog(LOG_DEBUG, "modules: begin initializing modules (threading=%d)", threading); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_control()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_euidindex()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_msgbase()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_database()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_autocompletion()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_bio()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_blog()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_calendar()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_checkpoint()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_virus()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_file_ops()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_ctdl_message()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_rooms()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_serv_session()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_syscmd()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_serv_user()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_expire()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_fulltext()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_image()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_imap()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_sieve()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_inetcfg()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_instmsg()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_listdeliver()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_listsub()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_migrate()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_newuser()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_nntp()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_notes()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_openid_rp()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_pop3()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_pop3client()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_roomchat()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_rssclient()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_rwho()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_smtp()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_smtpclient()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_spam()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_test()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_upgrade()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_vcard()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_wiki()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_xmpp()); - syslog(LOG_DEBUG, "modules: init %s", ctdl_module_init_netconfig()); - syslog(LOG_DEBUG, "modules: finished initializing modules (threading=%d)", threading); + syslog(LOG_DEBUG, "extensions: begin initializing modules (threading=%d)", threading); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_control()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_euidindex()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_msgbase()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_database()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_autocompletion()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_bio()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_blog()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_calendar()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_checkpoint()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_virus()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_file_ops()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_ctdl_message()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_rooms()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_serv_session()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_syscmd()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_serv_user()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_expire()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_fulltext()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_image()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_imap()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_sieve()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_inetcfg()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_instmsg()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_listdeliver()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_listsub()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_migrate()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_newuser()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_nntp()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_notes()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_openid_rp()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_pop3()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_pop3client()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_roomchat()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_rssclient()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_rwho()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_smtp()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_smtpclient()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_spam()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_test()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_upgrade()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_vcard()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_wiki()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_xmpp()); + syslog(LOG_DEBUG, "extensions: init %s", ctdl_module_init_netconfig()); + syslog(LOG_DEBUG, "extensions: finished initializing modules (threading=%d)", threading); } diff --git a/citadel/utils/guesstimezone.sh b/citadel/utils/guesstimezone.sh old mode 100644 new mode 100755 -- 2.30.2