X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=docs%2Fcontrib%2Fbuild_nmh;h=44b2f31ded0d839e82341b203179885e49b406e1;hb=6a83547f2f35bc049dbcb552d6f3bc9979980817;hp=cc83974370fefb65ae3f563878b526a11ae29c63;hpb=3d21b136955bae5202ee7a7443b6745e9c5c5eea;p=mmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index cc83974..44b2f31 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -47,25 +47,6 @@
 ####
 which=which
 ldd=ldd
-locking=
-
-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.
@@ -110,7 +91,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
@@ -120,30 +103,23 @@ 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 ]; 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_mts=smtp
 config_smtpservers=localhost
 config_sasl=n
 config_tls=n
 config_editor=vi
-config_pager=more
+for i in more less most cat; do
+  if which $i >/dev/null 2>&1; then
+    config_pager=$i
+    break
+  fi
+done
 config_debug=n
 
-if mhparam >/dev/null 2>&1; then
+if install-mh -check >/dev/null 2>&1; then
   # Determine config options from installed nmh.
   mhparam=`which mhparam`
   mhbin=`dirname "$mhparam"`
@@ -192,15 +168,13 @@ if [ $yes -eq 0 ]; then
   read prefix
   [ "$prefix" ]  &&  config_prefix="$prefix"
 
-  printf 'Locking type (dot|fcntl|flock|lockf) [%s]: ' $config_locking
-  read locking
-  [ "$locking" ]  &&  config_locking="$locking"
-
   printf 'MTS (smtp|sendmail) [%s]: ' $config_mts
   read mts
   [ "$mts" ]  &&  config_mts="$mts"
 
-  if [ ! "$mts"  -o  "$mts" = smtp ]; then
+  if [ "$mts"  -o  "$mts" = smtp ]; then
+    :
+  else
     printf 'SMTP server(s), space separated [%s]: ' $config_smtpservers
     read response
     servers=`echo $response | sed -e 's/ /\\\ /g'`
@@ -237,8 +211,6 @@ fi
 smtpservers=
 config_opts="--prefix=$config_prefix"
 
-[ "$config_locking" ]  &&  \
-  config_opts="$config_opts --with-locking=$config_locking"
 [ "$config_mts"  -a  "$config_mts" != smtp ]  &&  \
   config_opts="$config_opts --with-mts=$config_mts"
 [ "$config_smtpservers"  -a  "$config_smtpservers" != localhost ]  &&  \
@@ -291,7 +263,7 @@ if [ $status -eq 0 ]; then
 
   if [ $status -eq 0 ]; then
     [ $verbose -ge 1 ]  &&  echo testing . . .
-    checkoutput=`make $check SETGID_MAIL= 2>>$logfile`
+    checkoutput=`make $check 2>>$logfile`
     status=$?
 
     tests_summary=`echo "$checkoutput" | grep tests`
@@ -306,7 +278,7 @@ if [ $status -eq 0 ]; then
     if [ $status -eq 0 ]; then
       if [ $install -ge 1 ]; then
         [ $verbose -ge 1 ]  &&  echo installing . . .
-        ($installpriv make install) >/dev/null 2>>$logfile
+        (make install) >/dev/null 2>>$logfile
         status=$?
       fi
 
@@ -319,7 +291,8 @@ if [ $status -eq 0 ]; then
   fi
 fi
 
-grep -E 'Error|warn' $logfile
+grep 'Error' $logfile
+grep 'warn' $logfile
 [ $status -ne 0 ]  &&  echo build failed!
 [ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully