[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 6749991db7847b6b9fb253a55cc081b150867da5

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  6749991db7847b6b9fb253a55cc081b150867da5 (commit)
      from  0c926c599d9def7f70e674b7628a4bafd8cd6698 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=6749991db7847b6b9fb253a55cc081b150867da5


commit 6749991db7847b6b9fb253a55cc081b150867da5
Author: David Levine <address@hidden>
Date:   Tue Feb 7 21:43:26 2012 -0600

    Added OURDEFS to DEFS in Makefile.am, to restore it in the Makefile.  
Updated documentation in INSTALL.

diff --git a/.gitignore b/.gitignore
index 44bc82f..df57aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,8 +44,8 @@ a.out.DSYM/
 /mts/libmts.a
 /sbr/*.a
 /sbr/sigmsg.h
-/test/testbuild
-/test/testinstall
+/test/testbuild/
+/test/testinstall/
 /uip/ali
 /uip/anno
 /uip/ap
diff --git a/INSTALL b/INSTALL
index 71a9004..feea184 100644
--- a/INSTALL
+++ b/INSTALL
@@ -119,23 +119,35 @@ need an ANSI C compiler such as gcc.
 -----------------------------------------------
 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 either editing the user
-configuration section of the top level Makefile (after running configure)
-or giving "configure" initial values for these variables by setting them
-in the environment.  Using a Bourne-compatible shell (such as sh,ksh,zsh),
-
-you can do that on the command line like this:
+
+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
 
 Or on systems that have the "env" program, you can do it like this:
     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
 
-If you want to add to, not replace, compile flags, you can use
-OURDEFS with env or like this:
+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 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
+
+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
+
+Though note that the Makefile test target depends on the default
+target, so both be can built in one step with "make test".
+
 ----------------------------------------
 Building nmh on additional architectures
 ----------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 56178f9..ee9b511 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,11 @@ MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 auxexecdir = @libdir@
 
 ##
+## For backward compatibility, include OURDEFS in DEFS.  See INSTALL.
+##
+DEFS = @DEFS@ @OURDEFS@
+
+##
 ## nmh _does_ have a test suite!
 ##
 testdir = $(srcdir)/test

-----------------------------------------------------------------------

Summary of changes:
 .gitignore  |    4 ++--
 INSTALL     |   32 ++++++++++++++++++++++----------
 Makefile.am |    5 +++++
 3 files changed, 29 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System