Change admonish(NULL, "foo") to inform("foo, continuing...").

[nmh] / MACHINES

diff --git a/MACHINES b/MACHINES
index 1bc5da1679e51f68baa613851d6c50e7bf664707..920628d8fd322cd6e0d3beacccd4ec173222dfef 100644 (file)
--- a/MACHINES
+++ b/MACHINES
@@ -7,9 +7,9 @@ platforms:
     Cygwin (32- and 64-bit)
     FreeBSD 9
     FreeBSD 10
-    Linux (Fedora and Ubuntu distributions)
-    Mac OS X
-    OpenBSD
+    Linux (Fedora, Ubuntu, and CentOS distributions)
+    Mac OS X 10.9
+    OpenBSD 5.4
     Solaris 11
 
 nmh was known in the distant past to compile on the following platforms (save
@@ -20,6 +20,14 @@ the exceptions noted below), using an ANSI C compiler, such as gcc:
     Solaris 7 and 8 (sparc,x86)
     SunOS 4.1
 
+On all platforms, the following programs are required to build nmh from a
+snapshot of the source code repository:
+    autoconf 2.68 or later
+    automake 1.12 or later
+    flex 2.5.4 or later
+    bison 2.3 or later,  Berkeley yacc 1.9 or later, or Solaris yacc 4.0
+They are not required if building from an nmh distribution (.tar.gz) file.
+
 Platform-specific notes follow.
 
 ------------------------------------------------------------------------------
@@ -32,18 +40,44 @@ Run-time package requirements:
     readline (if you want readline support)
     cyrus-sasl-lib / libsasl2 (if configured with --with-cyrus-sasl)
     openssl-libs / libssl (if configured with --with-tls)
+    libcurl (if configured with --with-oauth)
 
 Additional build-time package requirements:
-    flex
     ncurses-devel / libncurses5-devel
     gdbm-devel, db4-devel or libdb-devel/libdb-dev (only needed for slocal(1))
     readline-devel (if you want readline support)
     cyrus-sasl-devel / libsasl2-dev (if configuring with --with-cyrus-sasl)
     openssl-devel / libssl-dev (if configuring with --with-tls)
+    libcurl-devel / libcurl-dev (if configured with --with-oauth)
+
+Test suite package requirements:
+    ncurses (tput is needed to run test/format/test-curses)
+
+------------------------------------------------------------------------------
+                                   Mac OS X
+------------------------------------------------------------------------------
+
+If configured with --with-tls on Mac OS 10.7 or later, there will be
+compile warnings from mts/smtp/smtp.c about the deprecated OpenSSL
+that is supplied with that system.  nmh will build and run with that
+OpenSSL, though it may be an old version.  Alternatively, the OpenSSL
+source code is available from http://www.openssl.org/source/.  To
+build 64-bit libraries, the OpenSSL configure command should start
+with, e.g.,
+    ./Configure darwin64-x86_64-cc
 
-Packages required to regenerate the configure script:
-    autoconf
-    automake
+To build nmh with those OpenSSL libraries, the CPPFLAGS and LDFLAGS
+can be set by adding the following to the nmh configure command line,
+or in the shell environment before calling configure or build_nmh:
+    CPPFLAGS='-D__arch64__ -IOpenSSL-include-path' LDFLAGS=-LOpenSSL-lib-path
+
+------------------------------------------------------------------------------
+                                   FreeBSD
+------------------------------------------------------------------------------
+
+Additional build-time package requirements:
+    devel/autotools
+    ftp/curl (if configured with --with-oauth)
 
 ------------------------------------------------------------------------------
                                     Cygwin
@@ -57,15 +91,16 @@ Run-time package requirements:
     libreadline7 (if you want readline support)
     libsasl2_3 (if configured with --with-cyrus-sasl)
     openssl (if configured with --with-tls)
+    libcurl (if configured with --with-oauth)
 
 Additional build-time package requirements:
-    flex
     libncurses-devel or libncursesw-devel
     libgdbm4-devel (only needed for slocal(1))
     libiconv-devel (if you want iconv support)
     libreadline-devel (if you want readline support)
     libsasl2-devel (if configuring with --with-cyrus-sasl)
     openssl-devel (if configuring with --with-tls)
+    libcurl-devel (if configured with --with-oauth)
 
     Older versions of libncurses-devel do not install /usr/include/curses.h,
     /usr/include/term.h, and /usr/include/termcap.h.  If yours does not,
@@ -73,15 +108,11 @@ Additional build-time package requirements:
     subdirectory, or build with:
         make DEFAULT_INCLUDES='-I. -I/usr/include/ncurses'
 
-Packages required to regenerate the configure script:
-    autoconf
-    automake
-
-When running the nmh test suite ("make check"), it helps to have /usr/bin/
-ahead of any Windows directories on your PATH.
+Test suite package requirements:
+    ncurses (tput is needed to run test/format/test-curses)
 
-Note that the -link switch to refile cannot be used on FAT32 and similar
-filesystems.
+Note that the -link switch to refile cannot be used on FAT32 and other
+filesystems that do not support hard links.
 
 ------------------------------------------------------------------------------
                                      HPUX