X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8e0f9bd3daae9d05dec58026d5a5924367e4e874..ca1186d36c785b135f20b8114d2d22ff2c08b695:/docs/contrib/build_nmh?ds=inline

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 25a02642..6a9ede8c 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -85,7 +85,9 @@ if [ $# -gt 0 ]; then
 fi
 
 #### Check to see that we're in a nmh source directory.
-if ! grep 'the authors of nmh' COPYRIGHT >/dev/null; then
+if grep 'the authors of nmh' COPYRIGHT >/dev/null; then
+  :
+else
   echo "$0: not in nmh source directory"
   exit 1
 fi
@@ -237,11 +239,11 @@ 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=
-if [ $install -ge 1  -a  `id -u` -ne 0 ]; then
+if [ $install -ge 1  -a  "$LOGNAME" != root ]; then
   if [ "$config_locking" = dot ]; then
     echo "$0: "'install requires chgrp and chmod 2755'
     echo 'so will sudo to install.  Terminate with Ctrl-C if unacceptable.'
@@ -273,8 +275,17 @@ fi
 #### Build.
 ####
 [ $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
+    #### configure will supply -g -O2 with gcc, but only if CFLAGS
+    #### isn't defined.
+    CFLAGS='-g -O2 -ansi -pedantic'
+  fi
+fi
+
 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
-./configure CFLAGS="${CFLAGS:+$CFLAGS }-g -O2 -ansi -pedantic" \
+./configure CFLAGS="${CFLAGS}" \
             $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
 status=$?
 
@@ -293,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=$?