X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=acconfig.h;h=551b2531269a6621a187230035da592097f22c0a;hp=8d15ad9e445717c8d0e2597905f33391a3344261;hb=fb49dd82ec42997b9df97f221c920f6596102c0a;hpb=fd2a10c17dec1491b240a3f098eb621c7bf55b31

diff --git a/acconfig.h b/acconfig.h
index 8d15ad9..551b253 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -22,10 +22,10 @@
  * other programs which may modify your maildrops.
  * Currently you can only use one type.
  */
-#define DOT_LOCKING   1
-/* #define FCNTL_LOCKING 1 */
-/* #define LOCKF_LOCKING 1 */
-/* #define FLOCK_LOCKING 1 */
+#undef DOT_LOCKING
+#undef FCNTL_LOCKING
+#undef LOCKF_LOCKING
+#undef FLOCK_LOCKING
 
 /*
  * If you have defined DOT_LOCKING, then the default is to
@@ -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"
 
@@ -115,12 +115,6 @@
 #define DEFAULT_MESSAGE_MODE "600"
 
 /*
- * The prefix which is prepended to the name of messages when they
- * are "removed" by rmm.  This should typically be `,' or `#'
- */
-#define BACKUP_PREFIX ","
-
-/*
  * Name of link to file to which you are replying.
  */
 #define LINK "@"
@@ -158,21 +152,17 @@
 /***** 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.
+ * The prefix which is prepended to the name of messages when they
+ * are "removed" by rmm.  This should typically be `,' or `#'
  */
-#undef SMTPMTS
+#define BACKUP_PREFIX ","
 
 /*
- * Use sendmail as transport agent.  Post messages by piping
- * them directly to sendmail.
+ * Define this if you want SMTP (simple mail transport protocol)
+ * 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
@@ -196,6 +194,12 @@
 #undef KPOP_PRINCIPAL
 
 /*
+ * Define this to use the Cyrus SASL library for authentication of
+ * POP and SMTP
+ */
+#undef CYRUS_SASL
+
+/*
  * Define this to compile support for using Hesiod to locate
  * pop servers into inc and msgchk.  Do not change this value
  * manually.  You must run configure with the option
@@ -247,10 +251,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
 
@@ -260,6 +260,9 @@
 /* Define to 1 if struct tm has gmtoff */
 #undef HAVE_TM_GMTOFF
 
+/* Define to 1 if struct utmp has ut_type */
+#undef HAVE_UTMP_UT_TYPE
+
 /* Define if your system has sigsetjmp */
 #undef HAVE_SIGSETJMP
 
@@ -275,14 +278,14 @@
 /* Define if your system has netdb.h */
 #undef HAVE_NETDB_H
 
-/* Define if your system has db1/ndbm.h instead of ndbm.h (ppclinux) */
-#undef HAVE_DB1_NDBM_H
-
 /* Define to the header containing the declaration of initgroups() on your
    system, if any.  AIX 4.[13], SunOS 4.1.3, and ULTRIX 4.2A have the function
    in libc but don't have a declaration anywhere. */
 #undef INITGROUPS_HEADER
 
+/* Define to the header containing the ndbm API prototypes */
+#undef NDBM_HEADER
+
 /* Define if your system actually has a prototype for snprintf() in <stdio.h>
    (or a file it includes) rather than just having a "stealth" definition of it
    in libc.a the way AIX 4.1 does. */