From d9de590a49646d8ecf94379c226521fd2e176c77 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 1 Nov 2007 19:08:25 +0000 Subject: [PATCH] The list of existing MTA's to disable has been reduced to include only software which is likely to have been included as part of the operating system's default installation. We really should not use this space as free advertisement for the competition, especially one project in particular who is trying to copy our ideas. I hope that particular project crashes and burns, and the developers stranded on a deserted island with no Internet access. --- citadel/configure.ac | 18 ++++++++++++++++++ citadel/setup.c | 2 -- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/citadel/configure.ac b/citadel/configure.ac index 13dd7bcae..9d307d67c 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -153,6 +153,7 @@ AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if presen AC_ARG_WITH(with_ldap, [ --with-ldap use OpenLDAP client library]) AC_ARG_WITH(with_libical, [ --with-libical use libical calendaring library]) AC_ARG_WITH(with_libsieve, [ --with-libsieve use libsieve mail sorting library]) +AC_ARG_WITH(with_expat, [ --with-expat use Expat XML parser]) if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then db_dir="$with_db" @@ -577,6 +578,22 @@ fi +dnl Checks for the Expat XML parser. +if test "x$with_expat" != xno ; then + AC_CHECK_HEADERS(expat.h, + [AC_CHECK_LIB(expat, XML_ParserCreateNS, + [ok_expat=yes],, + )]) +fi + +if test "x$ok_expat" = xyes ; then + SERVER_LIBS="-lexpat $SERVER_LIBS" + AC_DEFINE(HAVE_EXPAT, [], [define this if you have the Expat XML parser available]) +fi + + + + dnl Checks for the libical calendaring library. if test "x$with_libical" != xno ; then AC_CHECK_HEADERS(ical.h, @@ -830,6 +847,7 @@ echo 'zlib compression: ' $ok_zlib echo 'Calendar support: ' $ok_libical echo 'LDAP support: ' $ok_ldap echo 'Sieve mailbox filtering support: ' $ok_libsieve +echo 'Expat XML parser present: ' $ok_expat echo echo 'Note: if you are not using Linux, make sure you are using GNU make' echo '(gmake) to compile Citadel.' diff --git a/citadel/setup.c b/citadel/setup.c index 3dff70e1a..11d34cded 100644 --- a/citadel/setup.c +++ b/citadel/setup.c @@ -1251,7 +1251,6 @@ NEW_INST: disable_other_mta("dovecot"); disable_other_mta("exim"); disable_other_mta("exim4"); - disable_other_mta("hula"); disable_other_mta("imapd"); disable_other_mta("mta"); disable_other_mta("pop3d"); @@ -1261,7 +1260,6 @@ NEW_INST: disable_other_mta("saslauthd"); disable_other_mta("sendmail"); disable_other_mta("vmailmgrd"); - disable_other_mta("zimbra"); #endif /* Check for the 'db' nss and offer to disable it */ -- 2.39.2