No longer need trailing space after CFLAGS variable assignment.

[nmh] / build_nmh

diff --git a/build_nmh b/build_nmh
index 49af380aa64d2b7c3051d62daf5cd906d374fba7..9dd924cbf601a5faff439d4fd6b719ec85cbd49e 100755 (executable)
--- a/build_nmh
+++ b/build_nmh
@@ -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,8 +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"
+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=
@@ -372,8 +380,8 @@ if [ -z "$CFLAGS" ]; then
   fi
 fi
 
-printf "\n./configure ${CFLAGS:+CFLAGS=\"${CFLAGS}\" }$config_opts\n"
-./configure ${CFLAGS:+CFLAGS="${CFLAGS}"" "}$config_opts
+printf "\n./configure $config_opts${CFLAGS:+ CFLAGS=\"${CFLAGS}\"}\n"
+./configure $config_opts ${CFLAGS:+CFLAGS="${CFLAGS}"}
 status=$?
 
 if [ $status -eq 0 ]; then