* Merged mts/sendmail functionality into mts/smtp; switching between

[mmh] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 8d15ad9..5fdea1b 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -100,11 +100,11 @@
 #define BUILTIN_FTP 1
 
 /*
- * If you enable POP support, this is the the port name
- * that nmh will use.  Make sure this is defined in your
- * /etc/services file (or its NIS/NIS+ equivalent).  If you
- * are using KPOP, you will probably need to change this
- * to "kpop".
+ * If you enable POP support, this is the the port name that nmh will use.  Make
+ * sure this is defined in your /etc/services file (or its NIS/NIS+ equivalent).
+ * If you are using KPOP, you will need to change this to "kpop" unless you want
+ * to be able to use both POP3 _and_ Kerberized POP and plan to use inc and
+ * msgchk's -kpop switch every time in the latter case.
  */
 #define POPSERVICE "pop3"
 
@@ -158,21 +158,11 @@
 /***** END USER CONFIGURATION SECTION *****/
 @TOP@
 
-
 /*
  * Define this if you want SMTP (simple mail transport protocol)
- * support.  When sending mail, instead of passing the message to
- * the mail transport agent (typically sendmail), nmh will open a
- * socket connection to the mail port on the machine specified in
- * the `mts.conf' file (default is localhost), and speak SMTP directly.
- */
-#undef SMTPMTS
-
-/*
- * Use sendmail as transport agent.  Post messages by piping
- * them directly to sendmail.
+ * support.  This is currently always enabled.
  */
-#undef SENDMTS
+#define SMTPMTS 1
 
 /*
  * Define this to compile client-side support for pop into
@@ -183,6 +173,14 @@
 #undef POP
 
 /*
+ * Define this to compile client-side support for apop into
+ * inc and msgchk. Do not change this value manually. You
+ * must run configure with the '--enable-apop' option to
+ * correctly build the apop client support.
+ */
+#undef APOP
+
+/*
  * Define this to compile client-side support for kpop
  * (kerberized pop) into inc and msgchk.  Do not change this
  * value manually.  You must run configure with the option
@@ -247,10 +245,6 @@
  */
 #undef MAILGROUP
 
-/* Define ruserpass as _ruserpass if your libraries have a bug *
- * such that it can't find ruserpass, but can find _ruserpass. */
-#undef ruserpass
-
 /* Define if your system defines TIOCGWINSZ in sys/ioctl.h.  */
 #undef GWINSZ_IN_SYS_IOCTL