From d404c6fa5232e0e8ed10ee90c261b50d60fd08ea Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Wed, 19 Oct 2016 15:00:56 -0400
Subject: [PATCH] Pass CFLAGS to make distcheck via DISTCHECK_CONFIGURE_FLAGS.

---
 docs/contrib/build_nmh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 73111439..6a9ede8c 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -277,8 +277,10 @@ fi
 [ $verbose -ge 1 ]  &&  echo configuring . . .
 if [ -z "$CFLAGS" ]; then
   #### Only use these flags with gcc.
-  if cc -dM -E - < /dev/null 2>&1 | egrep __GNUC__ >/dev/null; then
-    CFLAGS="-g -O2 -ansi -pedantic"
+  if cc -dM -E - </dev/null 2>&1 | egrep __GNUC__ >/dev/null; then
+    #### configure will supply -g -O2 with gcc, but only if CFLAGS
+    #### isn't defined.
+    CFLAGS='-g -O2 -ansi -pedantic'
   fi
 fi
 
@@ -302,6 +304,13 @@ if [ $status -eq 0 ]; then
       fi
    fi
 
+    if [ -n "$CFLAGS" ]; then
+        #### Pass DISTCHECK_CONFIGURE_FLAGS through an environment
+        #### variable to avoid automake's quoting.
+        DISTCHECK_CONFIGURE_FLAGS="CFLAGS='${CFLAGS}'"
+        export DISTCHECK_CONFIGURE_FLAGS
+    fi
+
     [ $verbose -ge 1 ]  &&  echo testing . . .
     checkoutput=`make $check AM_COLOR_TESTS=always 2>>"$logfile"`
     status=$?
-- 
2.56.0