With the fixing of the bug that caused CPPFLAGS to get tromped on, remove

support for OURDEFS and direct people to use CPPFLAGS instead.

diff --git a/INSTALL b/INSTALL
index 04a0c0d..3cefafc 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -140,8 +140,9 @@ environment.  For example,
 
     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
 
-If you want to add to, not replace, compile flags, you can use OURDEFS:
-   ./configure OURDEFS='-Wextra -Wno-sign-compare'
+If you wish to add options that are only used at compile time instead of
+link time, you can use the CPPFLAGS variable:
+   ./configure CPPFLAGS='-Wextra -Wno-sign-compare'
 
 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
@@ -177,7 +178,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
-    /usr/local/src/nmh-1.0/configure
+    /usr/local/src/nmh-1.5/configure
     make
 
 ---------------------

diff --git a/Makefile.am b/Makefile.am
index 42e71fe..41dee6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,6 @@ 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

diff --git a/configure.ac b/configure.ac
index e38fae1..a6b5525 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -389,9 +389,8 @@ dnl before system header files.
 AS_CASE(["$host_os"],
        [linux*],
        [# Like DEFS, but doesn't get stomped on by configure when using config.h:
-    test -z "$OURDEFS"  &&  OURDEFS="-D_GNU_SOURCE"  \
-                        ||  OURDEFS="$OURDEFS -D_GNU_SOURCE"])
-AC_SUBST(OURDEFS)
+         AS_IF([test -z "$CPPFLAGS"],[CPPFLAGS="-D_GNU_SOURCE"],
+                [CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"])])
 
 AC_HEADER_STDC
 AC_HEADER_TIOCGWINSZ
@@ -740,7 +739,7 @@ host os                    : ${host}
 compiler                   : ${CC}
 compiler flags             : ${CFLAGS}
 linker flags               : ${LDFLAGS}
-definitions                : ${OURDEFS}
+preprocessor flags         : ${CPPFLAGS}
 source code location       : ${srcdir}
 binary install path        : ${nmhbin}
 library install path       : ${nmhlib}