Try including termcap.h before curses.h to see if that solves

[nmh] / docs / contrib / build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index f0b0c56cde724cf8ab5463845877092bf9252b6c..cb2265cb46c308e44b223ead54f598f58f1ead91 100755 (executable)
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -41,11 +41,6 @@
 #   rpm-build, with -r
 
 
-####
-#### OS-specific setup.
-####
-ldd=ldd
-
 ####
 #### Interpret command arguments.
 ####
@@ -149,12 +144,19 @@ if install-mh -check >/dev/null 2>&1; then
     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
+      echo "$0: -y not supported with currently installed nmh"
+      exit 1
+    fi
   fi
 fi
 
@@ -273,17 +275,19 @@ if [ $status -eq 0 ]; then
    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'`
+    fails=`echo "$checkoutput" | grep FAIL`
     if [ "$tests_summary" ]; then
       echo '===================' >>"$logfile"
-      echo "$tests_summary" >>"$logfile"
       [ "$test_not_run" ]  &&  echo "$test_not_run" >>"$logfile"
+      [ "$fails" ]  &&  echo "$fails" >>"$logfile"
+      echo "$tests_summary" >>"$logfile"
       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \
         echo "$checkoutput" | tail -n 4 >>"$logfile"
@@ -305,12 +309,14 @@ if [ $status -eq 0 ]; then
   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
-[ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully
 
 exit $status