Undid wrapping of setjmp() and sigsetjmp() of

[mmh] / INSTALL

diff --git a/INSTALL b/INSTALL
index b1dca8c..251ba7b 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -2,9 +2,18 @@
 # INSTALL -- installation instructions
 #
 
 # INSTALL -- installation instructions
 #
 

---------------
-Installing nmh
---------------
+--------------------------------
+Installing nmh, guided by script
+--------------------------------
+For routine installation on popular platforms, the shell script in
+docs/contrib/build_nmh can be used to guide you through configuration.
+It will then build and optionally (with -i) install in the configured
+location.
+
+
+------------------------
+Installing nmh, manually
+------------------------

 Please read all of the following instructions before you begin
 building nmh.
 
 Please read all of the following instructions before you begin
 building nmh.
 

@@ -50,12 +59,10 @@ need an ANSI C compiler such as gcc.
 
 3) make
 
 
 3) make
 

-4) make test
+4) make check

 
 

-   This takes a bit of time (under 2 minutes on a modern machine) but
-   is highly recommended.  "make test" copies your configuration and
-   rebuilds nmh completely in a sandbox, so you can test without
-   disturbing an existing nmh installation or any of your nmh folders.
+   This takes a bit of time, around one minute on a modern machine,
+   but is highly recommended.

 
 5) make install
 
 
 5) make install
 

@@ -93,14 +100,11 @@ need an ANSI C compiler such as gcc.
        traffic.  See the discussion of the --with-smtpserver configure
        option below.
 
        traffic.  See the discussion of the --with-smtpserver configure
        option below.
 

-   If you compile with POP support, but don't want to use it exclusively,
-   you can use the `-host' and `-user' options to `inc' and `msgchk'
-   rather than hardcoding pophost in `mts.conf'.
+   If you don't want to hardcode pophost in `mts.conf', you can use
+   the `-host' and `-user' options to `inc' and `msgchk'.

 
    Check the `mh-tailor' man page for a list of all the available options
 
    Check the `mh-tailor' man page for a list of all the available options

-   for this file ("masquerade" may be of particular interest, though its
-   default value allows the most flexibility.  See the discussion of the
-   --enable-masquerade configure option below).
+   for this file.

 
 7) Edit the file `mhn.defaults' (installed in the nmh `etc' directory).
    This file contains the default profile entries for the nmh command
 
 7) Edit the file `mhn.defaults' (installed in the nmh `etc' directory).
    This file contains the default profile entries for the nmh command

@@ -135,30 +139,21 @@ Compiler options, or using a different compiler
 By default, configure will use the "gcc" compiler if found.  You can
 use a different compiler, or add unusual options for compiling or
 linking that the "configure" script does not know about, by giving
 By default, configure will use the "gcc" compiler if found.  You can
 use a different compiler, or add unusual options for compiling or
 linking that the "configure" script does not know about, by giving

-"configure" initial values for these in its environment.  Using a
-Bourne-compatible shell, such as sh, ksh, zsh, or bash, you can do
-that on the command line like this:
-    CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+"configure" initial values for these on its command line or in its
+environment.  For example,

 
 

-Or on systems that have the "env" program, you can do it like this:
-    env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+    ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix

 
 

-If you want to add to, not replace, compile flags, you can use OURDEFS
-with env or like this:
-    OURDEFS='-Wextra -Wno-sign-compare' ./configure
+If you wish to add options that are only used at compile time instead of
+link time, you can use the CPPFLAGS variable:

 
 

-If you want to add to both compile and link flags at build time
-without putting them in the configuration, you can use an otherwise
-unused Makefile macro, like this:
-    make AM_CFLAGS=--coverage
+   ./configure CPPFLAGS='-Wextra -Wno-sign-compare'

 
 

-That does not include that setting in the configuration, so you will
-have to repeat it if you re-run "make".  One example would be if you
-build the test suite as a separate step:
-    make test AM_CFLAGS=--coverage
+If you want to add to both compile and link flags at build time
+without putting them in the configuration, you can use the AM_CFLAGS
+Makefile macro:

 
 

-Though note that the Makefile test target depends on the default
-target, so both be can built in one step with "make test".
+    make AM_CFLAGS=--coverage

 
 ----------------------------------------
 Building nmh on additional architectures
 
 ----------------------------------------
 Building nmh on additional architectures

@@ -181,7 +176,7 @@ run the "configure" script.  "configure" automatically checks for the
 source code in the directory that "configure" is in.  For example,
 
     cd /usr/local/solaris/nmh
 source code in the directory that "configure" is in.  For example,
 
     cd /usr/local/solaris/nmh

-    /usr/local/src/nmh-1.0/configure
+    /usr/local/src/nmh-1.5/configure

     make
 
 ---------------------
     make
 
 ---------------------

@@ -207,25 +202,6 @@ Options for configure
 --enable-debug
      Enable debugging support.
 
 --enable-debug
      Enable debugging support.
 

---enable-masquerade[='draft_from mmailid username_extension']
-     By default, all three masquerade options are enabled.
-
-     If this option is disabled, the mts.conf file will contain the
-     line "masquerade: " (with no value), which may be manually edited
-     later.  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.
-
-     See the mh-tailor(5) man page for full documentation of "masquerade:".
-
-     This option will likely be removed in a future version of nmh.
-
---enable-pop
-     Enable client-side support for pop.
-
---enable-apop
-     Enable client-side support for apop (Authenticated POP).
-

 --with-editor=EDITOR  (DEFAULT is vi)
      specify the full path of the default editor to use.  If this
      option is not given, then the configuration process will search
 --with-editor=EDITOR  (DEFAULT is vi)
      specify the full path of the default editor to use.  If this
      option is not given, then the configuration process will search

@@ -234,16 +210,6 @@ 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-hesiod=PREFIX
-     Specify the location of Hesiod.
-
---with-krb4=PREFIX
-     Specify the location of Kerberos V4 for KPOP support. After
-     running configure, you will need to change the POPSERVICE #define in
-     config.h if you want to use KPOP exclusively (rather than being able
-     to switch between KPOP and normal POP3).  See the comments inside
-     config.h for details.
-

 --with-locking=LOCKTYPE    (DEFAULT is dot)
      Specify the locking mechanism when attempting to "inc" or
      "msgchk" a local mail spool. Valid options are "dot",
 --with-locking=LOCKTYPE    (DEFAULT is dot)
      Specify the locking mechanism when attempting to "inc" or
      "msgchk" a local mail spool. Valid options are "dot",