X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c703902741e0f7ce55f87e48ef0d00901195f1bc..bd9005ab3cae3b104b11db5c893b5cfe44df56a9:/docs/contrib/build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index f0b0c56c..ef399f86 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -149,11 +149,11 @@ if install-mh -check >/dev/null 2>&1; then
     fi
   fi
 
-  if $ldd "$mhbin/inc" | grep sasl >/dev/null; then
+  if $ldd "`$mhbin/mhparam libdir`/post" | grep sasl >/dev/null; then
     config_sasl=y
   fi
 
-  if $ldd "$mhbin/inc" | grep ssl >/dev/null; then
+  if $ldd "`$mhbin/mhparam libdir`/post" | grep ssl >/dev/null; then
     config_tls=y
   fi
 fi
@@ -273,17 +273,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"
@@ -306,7 +308,10 @@ if [ $status -eq 0 ]; then
 fi
 
 grep 'Error' "$logfile"
-grep 'warn' "$logfile"
+#### Ignore the warning when sbr/dtimep.c is built with flex 2.5.36
+#### or 2.5.37.
+grep 'warn' "$logfile" | \
+  grep -v 'sbr/dtimep.c:.*comparison between signed and unsigned'
 if [ $status -ne 0 ]; then
   echo build failed!
   echo build log is in "$logfile"