Removed dependence of build_nmh on ldd by adding sasl and tls

components to mhparam(1).

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index adc6e1c..2aa196e 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,14 @@ if install-mh -check >/dev/null 2>&1; then
     fi
   fi
 
-  if $ldd "`$mhbin/mhparam libdir`/post" | grep sasl >/dev/null; then
-    config_sasl=y
-  fi
+  if test -x "$mhbin/mhparam"; then
+    case `$mhbin/mhparam sasl` in
+      *sasl*) config_sasl=y ;;
+    esac
 
-  if $ldd "`$mhbin/mhparam libdir`/post" | grep ssl >/dev/null; then
-    config_tls=y
+    case `$mhbin/mhparam tls` in
+      *tls*) config_tls=y ;;
+    esac
   fi
 fi
 

diff --git a/uip/mhparam.c b/uip/mhparam.c
index a1ca28f..9da7ba1 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -47,6 +47,20 @@ char *lockmethod =
 #endif
     ;
 
+char *sasl =
+#ifdef CYRUS_SASL
+    "cyrus_sasl";
+#else
+    "";
+#endif
+
+char *tls =
+#ifdef TLS_SUPPORT
+    "tls";
+#else
+    "";
+#endif
+
 struct proc {
     char *p_name;
     char **p_field;
@@ -80,6 +94,8 @@ static struct proc procs [] = {
      { "libdir",        &mhlibdir },
      { "sbackup",       &sbackup },
      { "lockmethod",    &lockmethod },
+     { "sasl",          &sasl },
+     { "tls",           &tls },
      { NULL,            NULL },
 };