mhshowsbr.c: Delete single-use global int `nolist'.

[nmh] / build_nmh

diff --git a/build_nmh b/build_nmh
index 832bd5819e7af45e0599e3f4fd5fc77bb03353c3..468e5fe2683d0508955415a6d2190d77a080c4d1 100755 (executable)
--- a/build_nmh
+++ b/build_nmh
@@ -33,7 +33,7 @@
 #     -l <logfile name>, default 'build_nmh.log', - for stdout/stderr
 #   Advanced/developer use:
 #     -c to run 'make distcheck' instead of 'make check'
-#     -d to build nmh with asserts enabled and optimization disabled
+#     -d to build nmh with optimization disabled
 #     -s to use 'make superclean': requires recent autoconf and automake,
 #        see docs/README.developers
 #     -r to build rpm
@@ -48,7 +48,7 @@ logfile=build_nmh.log
 usage="usage:
   [-b <branch>, only if downloading]
   [-c to run 'make distcheck' instead of 'make check']
-  [-d to build nmh with asserts enabled and optimization disabled]
+  [-d to build nmh with optimization disabled]
   [-i to install nmh]
   [-l <logfile name>, default '$logfile']
   [-r to build rpm]
@@ -257,7 +257,7 @@ if install-mh -check >/dev/null 2>&1; then
     fi
   fi
 
-  if test -x "$mhbin/mhparam"; then
+  if test $yes -eq 1  -a  -x "$mhbin/mhparam"; then
     if mhparam sasl >/dev/null; then
       case `$mhbin/mhparam sasl` in
         *sasl*) config_sasl=y ;;
@@ -315,9 +315,16 @@ config_opts="--prefix=$config_prefix"
   config_opts="$config_opts --with-mts=$config_mts"
 [ "$config_smtpserver"  -a  "$config_smtpserver" != localhost ]  &&
   config_opts="$config_opts --with-smtpserver=$config_smtpserver"
-[ "$config_sasl" = y ]  &&  config_opts="$config_opts --with-cyrus-sasl"
-[ "$config_tls" = y ]  &&  config_opts="$config_opts --with-tls"
-[ $config_debug = y ]  &&  config_opts="$config_opts --enable-assert"
+if [ "$config_sasl" = y ]; then
+    config_opts="$config_opts --with-cyrus-sasl"
+elif [ "$config_sasl" != 'determined by configure' ]; then
+    config_opts="$config_opts --with-cyrus-sasl=no"
+fi
+if [ "$config_tls" = y ]; then
+    config_opts="$config_opts --with-tls"
+elif [ "$config_tls" != 'determined by configure' ]; then
+    config_opts="$config_opts --with-tls=no"
+fi
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 installpriv=
@@ -366,7 +373,7 @@ if [ -z "$CFLAGS" ]; then
     #### isn't defined.
     CFLAGS='-g -std=c99 -pedantic'
     if [ "$config_debug" = n ]; then
-      CFLAGS="$CFLAGS -O2"
+      CFLAGS="$CFLAGS -O2 -D_FORTIFY_SOURCE=2"
     else
       CFLAGS="$CFLAGS -O0"
     fi