Commit 9c663383ab54e0290781ac1c25d790ce03160e08 introduced

[nmh] / docs / contrib / build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index ef399f86be7e9ddc25480a333671fa6ddb81b72a..cb2265cb46c308e44b223ead54f598f58f1ead91 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.
 ####


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

-  if $ldd "`$mhbin/mhparam libdir`/post" | grep sasl >/dev/null; then
-    config_sasl=y
-  fi
-
-  if $ldd "`$mhbin/mhparam libdir`/post" | 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
 
   fi
 fi
 


@@ -307,15 +309,14 @@ if [ $status -eq 0 ]; then
   fi
 fi
 
   fi
 fi
 

-grep 'Error' "$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
+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