X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=docs%2Fcontrib%2Fbuild_nmh;h=d8d2315c86a7ae27040a13daf84604f0ff94b867;hb=a69289ce6e12c75a4a934d966a502b3899374e29;hp=55a61c255a6aeab2b16a11af806fc74036a679fa;hpb=3b8777a6c6302dca8b8db4bb2bfc545f04733bd0;p=mmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 55a61c2..d8d2315 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -47,25 +47,6 @@
 ####
 which=which
 ldd=ldd
-locking=dot
-
-os=${OSTYPE:-`uname -s`}
-#### It'd be nice to have configure decide what locking style to use.
-#### In the meantime, select it manually.  To determine what style
-#### locking your system uses by default, try something like this,
-#### assuming that strace is installed:
-####   $ echo test | strace -o /tmp/mail.strace mail -s test $LOGNAME
-#### Then look in /tmp/mail.strace for fcntl, flock, and lockf system
-#### calls and opens of dot files in the mail spool.
-#### These might help but are old:
-####   https://bugzilla.mozilla.org/show_bug.cgi?id=239013#c9
-####   http://www.jwz.org/doc/movemail.html
-case "$os" in
-  aix) locking=fcntl ;;
-  freebsd*) locking=flock ;;
-  linux* ) locking=fcntl ;;
-esac
-
 
 ####
 #### Interpret command arguments.
@@ -122,21 +103,10 @@ fi
 #### spaces (currently just smtpservers) specially.
 ####
 
-#### dotlocking, the usual default, requires chgrp and chmod of inc.
-installpriv=
-if [ $install -ge 1  -a  `id -u` -ne 0  -a  "$OSTYPE" != cygwin ]; then
-  if [ "x$locking" = x  -o  "$locking" = dot ]; then
-    echo "$0: "'install requires chgrp and chmod 2755'
-    echo 'so will sudo to install.  Terminate with Ctrl-C if unacceptable.'
-    installpriv=sudo
-  fi
-fi
-
-
 #### Here are the config options that we will try to detect, then
 #### confirm, and finally set.
 config_prefix=/usr/local/nmh
-config_locking="$locking"
+config_locking=
 config_mts=smtp
 config_smtpservers=localhost
 config_sasl=n
@@ -159,26 +129,27 @@ if install-mh -check >/dev/null 2>&1; then
 
   mtsconf=`dirname "$mhbin"`/etc/mts.conf
   if [ -f "$mtsconf" ]; then
-    mts_entry=`grep '^mts:' $mtsconf`
-    if [ "mts_entry" ]; then
-      mts=`echo $mts_entry | sed -e 's/^mts: *//'`
+    mts_entry=`grep '^mts:' "$mtsconf"`
+    if [ "$mts_entry" ]; then
+      mts=`echo "$mts_entry" | sed -e 's/^mts: *//'`
       if [ "$mts"  -a  "$mts" != smtp ]; then
         config_mts="$mts"
       fi
     fi
 
-    mtsconfservers=`grep '^servers:' $mtsconf`
+    mtsconfservers=`grep '^servers:' "$mtsconf"`
     if [ "$mtsconfservers" ]; then
-      servers=`echo $mtsconfservers | sed -e 's/^servers: *//' -e 's/ /\\\ /g'`
+      servers=`echo "$mtsconfservers" | \
+               sed -e 's/^servers: *//' -e 's/ /\\\ /g'`
       [ "$servers" ]  &&  config_smtpservers="$servers"
     fi
   fi
 
-  if $ldd $mhbin/inc | grep sasl >/dev/null; then
+  if $ldd "$mhbin/inc" | grep sasl >/dev/null; then
     config_sasl=y
   fi
 
-  if $ldd $mhbin/inc | grep ssl >/dev/null; then
+  if $ldd "$mhbin/inc" | grep ssl >/dev/null; then
     config_tls=y
   fi
 fi
@@ -199,17 +170,15 @@ if [ $yes -eq 0 ]; then
   read prefix
   [ "$prefix" ]  &&  config_prefix="$prefix"
 
-  printf 'Locking type (dot|fcntl|flock|lockf) [%s]: ' $config_locking
+  printf 'Locking type (dot|fcntl|flock|lockf) [determined by configure]: '
   read locking
   [ "$locking" ]  &&  config_locking="$locking"
 
-  printf 'MTS (smtp|sendmail) [%s]: ' $config_mts
+  printf 'MTS (smtp|sendmail/smtp|sendmail/pipe) [%s]: ' $config_mts
   read mts
   [ "$mts" ]  &&  config_mts="$mts"
 
-  if [ "$mts"  -o  "$mts" = smtp ]; then
-    :
-  else
+  if [ "$config_mts" = smtp ]; then
     printf 'SMTP server(s), space separated [%s]: ' $config_smtpservers
     read response
     servers=`echo $response | sed -e 's/ /\\\ /g'`
@@ -234,11 +203,11 @@ if [ $yes -eq 0 ]; then
 
   printf 'Default editor [%s]: ' $config_editor
   read editor
-  [ "$editor" ]  &&  config_editor=$editor
+  [ "$editor" ]  &&  config_editor="$editor"
 
   printf 'Pager [%s]: ' $config_pager
   read pager
-  [ "$pager" ]  &&  config_pager=$pager
+  [ "$pager" ]  &&  config_pager="$pager"
 
   #### Don't confirm debug here:  obey the -d option to this script.
 fi
@@ -264,6 +233,17 @@ config_opts="--prefix=$config_prefix"
   config_opts="$config_opts --enable-debug"
 
 
+#### dotlocking, the usual default, requires chgrp and chmod of inc.
+installpriv=
+if [ $install -ge 1  -a  `id -u` -ne 0 ]; 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.'
+    installpriv=sudo
+  fi
+fi
+
+
 ####
 #### Clean up, and set up with autoconfig if necessary.
 ####
@@ -276,12 +256,12 @@ if [ -f Makefile ]; then
   fi
 fi
 
-/bin/rm -f $logfile
+/bin/rm -f "$logfile"
 if [ -f configure  -a  -f Makefile.in ]; then
   :
 else
   [ $verbose -ge 1 ]  &&  echo autoconfiguring . . .
-  ./autogen.sh >>$logfile 2>&1
+  ./autogen.sh >>"$logfile" 2>&1
 fi
 
 
@@ -289,48 +269,64 @@ fi
 #### Build.
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .
-echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>$logfile 2>&1
-./configure $config_opts ${smtpservers:+"$smtpservers"} >>$logfile 2>&1
+echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
+./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
 status=$?
 
 if [ $status -eq 0 ]; then
   [ $verbose -ge 1 ]  &&  echo building . . .
-  make >>$logfile 2>&1
+  make >>"$logfile" 2>&1
   status=$?
 
   if [ $status -eq 0 ]; then
+    if [ "$TESTS_SHELL"x = x ]; then
+      #### Bonus:  use heirloom shell to test, if available, and if
+      #### TESTS_SHELL hadn't already been set.
+      heirloom_shell=/usr/lib/heirloom/5bin/sh
+      if [ -x "$heirloom_shell" ]; then
+        TESTS_SHELL="$heirloom_shell"; export TESTS_SHELL
+      fi
+   fi
+
     [ $verbose -ge 1 ]  &&  echo testing . . .
-    checkoutput=`make $check SETGID_MAIL= 2>>$logfile`
+    checkoutput=`make $check 2>>"$logfile"`
     status=$?
 
     tests_summary=`echo "$checkoutput" | grep tests`
+    #### If multiple tests not run, that line will be caught by the
+    #### "grep tests" above.
+    test_not_run=`echo "$checkoutput" | grep 'test was not run'`
     if [ "$tests_summary" ]; then
-      echo '===================' >>$logfile
-      echo $tests_summary >>$logfile
-      echo '===================' >>$logfile
+      echo '===================' >>"$logfile"
+      echo "$tests_summary" >>"$logfile"
+      [ "$test_not_run" ]  &&  echo "$test_not_run" >>"$logfile"
+      echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \
-        echo "$checkoutput" | tail -n 4 >>$logfile
+        echo "$checkoutput" | tail -n 4 >>"$logfile"
     fi
 
     if [ $status -eq 0 ]; then
       if [ $install -ge 1 ]; then
         [ $verbose -ge 1 ]  &&  echo installing . . .
-        ($installpriv make install) >/dev/null 2>>$logfile
+        ($installpriv make install) >/dev/null 2>>"$logfile"
         status=$?
       fi
 
       if [ $status -eq 0  -a  $build_rpm -ge 1 ]; then
         [ $verbose -ge 1 ]  &&  echo building rpm . . .
-        make rpm >/dev/null 2>>$logfile
+        make rpm >/dev/null 2>>"$logfile"
         status=$?
       fi
     fi
   fi
 fi
 
-grep 'Error' $logfile
-grep 'warn' $logfile
-[ $status -ne 0 ]  &&  echo build failed!
+grep 'Error' "$logfile"
+grep 'warn' "$logfile"
+if [ $status -ne 0 ]; then
+  echo build failed!
+  echo build log is in "$logfile"
+fi
 [ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully
 
 exit $status