* setup.c: added "exim4" to the list of non-Citadel MTA's which can be

  disabled during setup.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index e340ea6c4976bc5654fe56730ed73a8514ef303c..c821b93ee4b056b9735a4e1ac0e92174d8b51dc0 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 654.5  2005/08/09 16:28:32  ajc
+* setup.c: added "exim4" to the list of non-Citadel MTA's which can be
+  disabled during setup.
+
 Revision 654.4  2005/08/09 14:13:36  ajc
 * newinstall.sh: hunt for both 'make' and 'gmake', but this time make sure
   that the make in question is actually GNU Make, regardless of its name
@@ -7005,4 +7009,3 @@ 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/setup.c b/citadel/setup.c
index cfd3acc0769fa2a574b880b80d17e1a6b8241be8..a5c63531a93e4e31f12b171403d8ad25e230386e 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1198,6 +1198,7 @@ NEW_INST:
        disable_other_mta("popd");
        disable_other_mta("pop3d");
        disable_other_mta("exim");
+       disable_other_mta("exim4");
        disable_other_mta("dovecot");
        disable_other_mta("hula");
 #endif