Added check for successful decode of a different part with

[nmh] / docs / contrib / build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index f0b0c56cde724cf8ab5463845877092bf9252b6c..ae728d8934d8aa7806db2a093eaf72abf530cd57 100755 (executable)
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -41,11 +41,6 @@
 #   rpm-build, with -r
 
 
 #   rpm-build, with -r
 
 

-####
-#### OS-specific setup.
-####
-ldd=ldd
-

 ####
 #### Interpret command arguments.
 ####
 ####
 #### Interpret command arguments.
 ####


@@ -89,9 +84,7 @@ if [ $# -gt 0 ]; then
 fi
 
 #### Check to see that we're in a nmh source directory.
 fi
 
 #### Check to see that we're in a nmh source directory.

-if grep 'the authors of nmh' COPYRIGHT >/dev/null; then
-  :
-else
+if ! grep 'the authors of nmh' COPYRIGHT >/dev/null; then

   echo "$0: not in nmh source directory"
   exit 1
 fi
   echo "$0: not in nmh source directory"
   exit 1
 fi


@@ -124,6 +117,11 @@ finddir() {
   esac
 }
 
   esac
 }
 

+#### Figure out whether or not to use -n with tail.
+case `printf 'OK\n' | tail -n 1 2>&1` in
+  OK) tail='tail -n ' ;;
+  *)  tail='tail -' ;;
+esac

 
 if install-mh -check >/dev/null 2>&1; then
   # Determine config options from installed nmh.
 
 if install-mh -check >/dev/null 2>&1; then
   # Determine config options from installed nmh.


@@ -131,7 +129,7 @@ if install-mh -check >/dev/null 2>&1; then
 
   config_prefix=`cd $mhbin/.. && pwd`
 
 
   config_prefix=`cd $mhbin/.. && pwd`
 

-  mtsconf=`dirname "$mhbin"`/etc/mts.conf
+  mtsconf=`mhparam etcdir`/mts.conf

   if [ -f "$mtsconf" ]; then
     mts_entry=`grep '^mts:' "$mtsconf"`
     if [ "$mts_entry" ]; then
   if [ -f "$mtsconf" ]; then
     mts_entry=`grep '^mts:' "$mtsconf"`
     if [ "$mts_entry" ]; then


@@ -149,12 +147,21 @@ if install-mh -check >/dev/null 2>&1; then
     fi
   fi
 
     fi
   fi
 

-  if $ldd "$mhbin/inc" | grep sasl >/dev/null; then
-    config_sasl=y
-  fi
-
-  if $ldd "$mhbin/inc" | grep ssl >/dev/null; then
-    config_tls=y
+  if test -x "$mhbin/mhparam"; then
+    if mhparam sasl >/dev/null; then
+      case `$mhbin/mhparam sasl` in
+        *sasl*) config_sasl=y ;;
+      esac
+
+      case `$mhbin/mhparam tls` in
+        *tls*) config_tls=y ;;
+      esac
+    else
+      tput smso
+      echo "$0: SASL and TLS detection not supported with current nmh"
+      [ $yes -eq 1 ]  &&  echo "will not configure either one in"
+      tput rmso
+    fi

   fi
 fi
 
   fi
 fi
 


@@ -214,7 +221,7 @@ config_opts="--prefix=$config_prefix"
 [ "$config_tls" = y ]  &&  \
   config_opts="$config_opts --with-tls"
 [ $config_debug = y ]  &&  \
 [ "$config_tls" = y ]  &&  \
   config_opts="$config_opts --with-tls"
 [ $config_debug = y ]  &&  \

-  config_opts="$config_opts --enable-debug"
+  config_opts="$config_opts --enable-debug --enable-assert"

 
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.
 
 
 #### dotlocking, the usual default, requires chgrp and chmod of inc.


@@ -241,9 +248,7 @@ if [ -f Makefile ]; then
 fi
 
 /bin/rm -f "$logfile"
 fi
 
 /bin/rm -f "$logfile"

-if [ -f configure  -a  -f Makefile.in ]; then
-  :
-else
+if [ ! -f configure  -o  ! -f Makefile.in ]; then

   [ $verbose -ge 1 ]  &&  echo autoconfiguring . . .
   ./autogen.sh >>"$logfile" 2>&1
 fi
   [ $verbose -ge 1 ]  &&  echo autoconfiguring . . .
   ./autogen.sh >>"$logfile" 2>&1
 fi


@@ -254,7 +259,8 @@ fi
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .
 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
 ####
 [ $verbose -ge 1 ]  &&  echo configuring . . .
 echo ./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1

-./configure $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1
+./configure CFLAGS="${CFLAGS:+$CFLAGS }-g -O2 -ansi -pedantic" \
+            $config_opts ${smtpservers:+"$smtpservers"} >>"$logfile" 2>&1

 status=$?
 
 if [ $status -eq 0 ]; then
 status=$?
 
 if [ $status -eq 0 ]; then


@@ -273,20 +279,22 @@ if [ $status -eq 0 ]; then
    fi
 
     [ $verbose -ge 1 ]  &&  echo testing . . .
    fi
 
     [ $verbose -ge 1 ]  &&  echo testing . . .

-    checkoutput=`make $check 2>>"$logfile"`
+    checkoutput=`make $check AM_COLOR_TESTS=always 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'`
     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'`

+    fails=`echo "$checkoutput" | grep FAIL`

     if [ "$tests_summary" ]; then
       echo '===================' >>"$logfile"
     if [ "$tests_summary" ]; then
       echo '===================' >>"$logfile"

-      echo "$tests_summary" >>"$logfile"

       [ "$test_not_run" ]  &&  echo "$test_not_run" >>"$logfile"
       [ "$test_not_run" ]  &&  echo "$test_not_run" >>"$logfile"

+      [ "$fails" ]  &&  echo "$fails" >>"$logfile"
+      echo "$tests_summary" >>"$logfile"

       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \
       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \

-        echo "$checkoutput" | tail -n 4 >>"$logfile"
+        echo "$checkoutput" | ${tail}4 >>"$logfile"

     fi
 
     if [ $status -eq 0 ]; then
     fi
 
     if [ $status -eq 0 ]; then


@@ -305,12 +313,14 @@ if [ $status -eq 0 ]; then
   fi
 fi
 
   fi
 fi
 

-grep 'Error' "$logfile"
-grep 'warn' "$logfile"
-if [ $status -ne 0 ]; then
+grep Error "$logfile"
+grep warn "$logfile"
+
+if [ $status -eq 0 ]; then
+  [ $verbose -ge 1 ]  &&  echo build completed successfully
+else

   echo build failed!
   echo build log is in "$logfile"
 fi
   echo build failed!
   echo build log is in "$logfile"
 fi

-[ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully

 
 exit $status
 
 exit $status