X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bd59d152c84f0abe565d1aaed6401b63c94c7f46..ca1186d36c785b135f20b8114d2d22ff2c08b695:/docs/contrib/build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index e25d480c..6a9ede8c 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -239,7 +239,7 @@ config_opts="--prefix=$config_prefix"
 [ "$config_oauth" = y ]  &&  \
   config_opts="$config_opts --with-oauth"
 [ $config_debug = y ]  &&  \
-  config_opts="$config_opts --enable-debug --enable-assert"
+  config_opts="$config_opts --enable-assert"
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 installpriv=
@@ -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=$?