From f7eb978bd395752d3d9037ea4436b8e2db41f135 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Sun, 18 Sep 2016 10:29:17 -0400
Subject: [PATCH] Moved CFLAGS additions to AM_CFLAGS.

---
 configure.ac   | 17 +++++++++--------
 m4/cppflags.m4 |  4 ++++
 2 files changed, 13 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 configure.ac

diff --git a/configure.ac b/configure.ac
old mode 100755
new mode 100644
index 44a71c89..d8dbdede
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,6 @@ dnl
 dnl configure.ac -- autoconf template for nmh
 dnl
 
-dnl Move this up a bit
 AC_PREREQ([2.68])
 
 AC_INIT([nmh], m4_normalize(m4_include([VERSION])), [nmh-workers@nongnu.org])
@@ -135,24 +134,26 @@ if test "$GCC" != yes; then
   dnl better to use an autoconf test, except -v will probably succeed
   dnl with many other compilers but have different meaning.
   AS_CASE([`${CC} -V 2>&1`],
-          [cc:\ Sun\ C*], [CFLAGS=\
-"${CFLAGS:+$CFLAGS }-v -errtags=yes -erroff=E_STATEMENT_NOT_REACHED"])
+          [cc:\ Sun\ C*], [AM_CFLAGS=\
+"${AM_CFLAGS:+$AM_CFLAGS }-v -errtags=yes -erroff=E_STATEMENT_NOT_REACHED"])
 fi
 
 AC_CACHE_CHECK([whether compiler supports -Wall], [nmh_cv_has_wall],
                [nmh_saved_cflags="$CFLAGS"
-               CFLAGS="$CFLAGS -Wall -Werror"
+               CFLAGS="$AM_CFLAGS $CFLAGS -Wall -Werror"
                AC_TRY_COMPILE([],[],nmh_cv_has_wall=yes,nmh_cv_has_wall=no)
                CFLAGS="$nmh_saved_cflags"])
-test "$nmh_cv_has_wall" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wall"
+test "$nmh_cv_has_wall" = "yes"  &&  AM_CFLAGS="${AM_CFLAGS:+$AM_CFLAGS }-Wall"
 
 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
                [nmh_saved_cflags="$CFLAGS"
-               CFLAGS="$CFLAGS -Wextra -Werror"
+               CFLAGS="$AM_CFLAGS $CFLAGS -Wextra -Werror"
                AC_TRY_COMPILE([],[],nmh_cv_has_wextra=yes,
                               nmh_cv_has_wextra=no)
                CFLAGS="$nmh_saved_cflags"])
-test "$nmh_cv_has_wextra" = "yes"  &&  CFLAGS="${CFLAGS:+$CFLAGS }-Wextra"
+test "$nmh_cv_has_wextra" = "yes"  &&  AM_CFLAGS="${AM_CFLAGS:+$AM_CFLAGS }-Wextra"
+
+AC_SUBST([AM_CFLAGS])
 
 dnl Check for any platform-specific additional AM_CPPFLAGS.  This depends on
 dnl MULTIBYTE_ENABLED having already been set.
@@ -583,7 +584,7 @@ nmh configuration
 nmh version                : AC_PACKAGE_VERSION
 host os                    : ${host}
 compiler                   : ${CC}
-compiler flags             : ${CFLAGS}
+compiler flags             : ${AM_CFLAGS} ${CFLAGS}
 linker flags               : ${LDFLAGS}
 preprocessor flags         : ${AM_CPPFLAGS} ${CPPFLAGS}
 source code location       : ${srcdir}
diff --git a/m4/cppflags.m4 b/m4/cppflags.m4
index d2cd351e..1e2401c1 100644
--- a/m4/cppflags.m4
+++ b/m4/cppflags.m4
@@ -23,6 +23,9 @@ AC_DEFUN([NMH_ADDL_CPPFLAGS],
     AC_LANG_WERROR
 
     nmh_saved_cppflags="$CPPFLAGS"
+    dnl autoconf doesn't look at AM_CFLAGS, so merge it into CFLAGS.
+    nmh_saved_cflags="$CFLAGS"
+    CFLAGS="$AM_CFLAGS $CFLAGS"
     dnl On successful compilation, break out of loop with the AM_CPPFLAGS.
     for nmh_cv_addl_cppflags in "" "-D_GNU_SOURCE"; do
         dnl Reload initial CPPFLAGS so candidates aren't accumulated.
@@ -41,6 +44,7 @@ AC_DEFUN([NMH_ADDL_CPPFLAGS],
                                    [return strdup("x") == 0])],
                   [AM_CPPFLAGS="${nmh_cv_addl_cppflags}"; break;])])
     done])
+    CFLAGS="$nmh_saved_cflags"
     CPPFLAGS="$nmh_saved_cppflags"
 
     dnl autoconf doesn't currently provide a macro to disable AC_LANG_WERROR,
-- 
2.56.0