Improve installation documentation

Fix up the various installation information so it matches reality.

diff --git a/INSTALL b/INSTALL
index 3639fe2cd70794d67bbdcb757e9f824b09d22a0d..5f1b88aaddf3d95598f64c2f4f0f4d4771ea878d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -202,7 +202,7 @@ Options for configure
      nmh command `prompter'.  If you specify `prompter', then you don't
      need to give the full pathname.
 
      nmh command `prompter'.  If you specify `prompter', then you don't
      need to give the full pathname.
 

---with-locking=LOCKTYPE    (DEFAULT is dot)
+--with-locking=LOCKTYPE    (DEFAULT is based on operating system)

      Specify the locking mechanism when attempting to "inc" or
      "msgchk" a local mail spool. Valid options are "dot",
      "fcntl", "flock", and "lockf". Of the four, dot-locking
      Specify the locking mechanism when attempting to "inc" or
      "msgchk" a local mail spool. Valid options are "dot",
      "fcntl", "flock", and "lockf". Of the four, dot-locking


@@ -223,12 +223,12 @@ Options for configure
      locked.
 
 --with-mts=MTS   (DEFAULT is smtp)
      locked.
 
 --with-mts=MTS   (DEFAULT is smtp)

-     Specify the default mail transport system you want to use.  The two
-     acceptable options are "smtp" (which is the default), and
-     "sendmail".  This value will be put into the mts.conf file.  You
-     may find it convenient to specify a value at configure-time,
-     however, so that each time nmh is reinstalled, the right value will
-     be there.
+     Specify the default mail transport system you want to use.  The three
+     acceptable options are "smtp" (which is the default),
+     "sendmail/smtp", and "sendmail/pipe".  This value will be put into
+     the mts.conf file.  You may find it convenient to specify a value
+     at configure-time, however, so that each time nmh is reinstalled,
+     the right value will be there.

 
      If you use "smtp", this will enable a direct SMTP (simple mail
      transport protocol) interface in nmh.  When sending mail, instead
 
      If you use "smtp", this will enable a direct SMTP (simple mail
      transport protocol) interface in nmh.  When sending mail, instead


@@ -237,12 +237,14 @@ Options for configure
      in the `mts.conf' file (default is localhost), and speak SMTP
      directly.
 
      in the `mts.conf' file (default is localhost), and speak SMTP
      directly.
 

-     If you use "sendmail", then `post' will send messages by forking a
+     If you use "sendmail/smtp", then `post' will send messages by forking a

      local copy of sendmail.  Currently it will still speak SMTP with
      this local copy of sendmail.
 
      local copy of sendmail.  Currently it will still speak SMTP with
      this local copy of sendmail.
 

-     If you wish to use a transport agent other than sendmail, you will
-     need to use a `sendmail wrapper'.
+     If you use "sendmail/pipe", then `post' will open a pipe to the
+     sendmail program and invoke it with the '-t' and '-i' options
+     and write the message to sendmail's standard input.  Note that
+     some nmh functionality is not available in this mode.

 
 --with-ndbm=LIB    (DEFAULT is to autodetect)
 --with-ndbmheader=HEADER     (DEFAULT is to autodetect)
 
 --with-ndbm=LIB    (DEFAULT is to autodetect)
 --with-ndbmheader=HEADER     (DEFAULT is to autodetect)


@@ -255,11 +257,6 @@ Options for configure
      If either of these options is given then the other must also be
      specified.
 
      If either of these options is given then the other must also be
      specified.
 

---with-pager=PAGER    (DEFAULT is more)
-     Specify the default pager (file lister) to use.  If this option
-     is not given, then the configuration process will search for the
-     command `more' and use it as the default.
-

 --with-smtpserver='SMTPSERVER'    (DEFAULT is localhost)
      If this option is not specified, the mts.conf file will contain
      the line "servers: localhost", which may be manually edited later.
 --with-smtpserver='SMTPSERVER'    (DEFAULT is localhost)
      If this option is not specified, the mts.conf file will contain
      the line "servers: localhost", which may be manually edited later.


@@ -269,15 +266,19 @@ Options for configure
 
      See the mh-tailor(5) man page for full documentation of "servers:".
 
 
      See the mh-tailor(5) man page for full documentation of "servers:".
 

---with-cyrus-sasl      (DEFAULT is without)
+--with-cyrus-sasl      (DEFAULT is to autodetect))

      Enable SASL support for SMTP and POP via the Cyrus SASL library.
      This is used for the POP AUTH and SMTP AUTH protocols.  This supports
      a wide variety of security mechanisms, including Kerberos/GSSAPI.
      Session encryption via SASL is supported for both POP and SMTP
      (depending on server-side support and the security mechanism in use).
 
      Enable SASL support for SMTP and POP via the Cyrus SASL library.
      This is used for the POP AUTH and SMTP AUTH protocols.  This supports
      a wide variety of security mechanisms, including Kerberos/GSSAPI.
      Session encryption via SASL is supported for both POP and SMTP
      (depending on server-side support and the security mechanism in use).
 

---with-tls             (DEFAULT is without)
-     Enable TLS session encryption support for SMTP via the STARTTLS command.
+--with-tls             (DEFAULT is to autodetect)
+     Enable TLS session encryption support for SMTP via the STARTTLS command
+     and TLS at connection start for both SMTP and POP.
+
+--with-oauth           (DEFAULT is to enable if curl is installed)
+     Enable OAuth2 authentication for SMTP and POP.

 
 --with-readline                (DEFAULT is to autodetect)
      Enable support for readline functionality (command history/editing) at
 
 --with-readline                (DEFAULT is to autodetect)
      Enable support for readline functionality (command history/editing) at

diff --git a/configure.ac b/configure.ac
index 1d42bf53bf6a4ba207b88d59da1fdfd9ddea0feb..f41c714043c3273b8da22259492e41460ea46aa4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,9 @@ AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != xyes -a \
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
 
 dnl Do you want client-side support for encryption with TLS?
 AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
 

-dnl Do you want client-side support for using OAuth2 for SMTP authentication?
+dnl Do you want client-side support for using OAuth2 for SMTP & POP auth?

 AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],
 AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],

-  [Enable OAuth2 support in SMTP auth]))
+  [Enable OAuth2 support in SMTP and POP auth]))

 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],
 
 dnl Set the backup prefix
 AC_ARG_WITH([hash-backup],