From: David Levine <levinedl@acm.org>
Date: Mon, 24 Oct 2016 23:01:14 +0000 (-0400)
Subject: Changed build_nmh sasl and tls defaults to be configure's.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/9cca3d060843239d619fa41168cb6342d6ac5461

Changed build_nmh sasl and tls defaults to be configure's.
---

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 6c90d66f..2d0fe3e0 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -188,8 +188,8 @@ config_prefix=/usr/local/nmh
 config_locking=
 config_mts=smtp
 config_smtpservers=localhost
-config_sasl=n
-config_tls=n
+config_sasl='determined by configure'
+config_tls='determined by configure'
 config_debug=n
 
 
@@ -235,7 +235,7 @@ if install-mh -check >/dev/null 2>&1; then
     else
       tput smso
       echo "$0: SASL and TLS detection not supported with current nmh"
-      [ $yes -eq 1 ]  &&  echo "will not configure them in"
+      [ $yes -eq 1 ]  &&  echo "configure will determine whether to enable"
       tput rmso
     fi
   fi
@@ -264,11 +264,11 @@ if [ $yes -eq 0 ]; then
     [ "$servers" ]  &&  config_smtpservers="$servers"
   fi
 
-  printf 'Cyrus SASL support [%s]: ' $config_sasl >&3
+  printf 'Cyrus SASL support [%s]: ' "$config_sasl" >&3
   read response
   [ "$response" = y  -o  "$response" = Y ]  &&  config_sasl=y
 
-  printf 'TLS support [%s]: ' $config_tls >&3
+  printf 'TLS support [%s]: ' "$config_tls" >&3
   read response
   [ "$response" = y  -o  "$response" = Y ]  &&  config_tls=y