From: David Levine <levinedl@acm.org>
Date: Mon, 9 Dec 2013 05:17:50 +0000 (-0600)
Subject: Commit 9c663383ab54e0290781ac1c25d790ce03160e08 introduced
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/29114cb84aa1a6446ab62f79f7c5dbae78516a07

Commit 9c663383ab54e0290781ac1c25d790ce03160e08 introduced
a backward incompatibility to build_nmh.  Refuse to support
-y if the current nmh installation has an mhparam that doesn't
support the sasl and tls components.
---

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index 2aa196ec..cb2265cb 100755
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -145,13 +145,18 @@ if install-mh -check >/dev/null 2>&1; then
   fi
 
   if test -x "$mhbin/mhparam"; then
-    case `$mhbin/mhparam sasl` in
-      *sasl*) config_sasl=y ;;
-    esac
-
-    case `$mhbin/mhparam tls` in
-      *tls*) config_tls=y ;;
-    esac
+    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