From 2c785689e4a3163f6f1b644ec31c6a82642e9f14 Mon Sep 17 00:00:00 2001 From: David Levine Date: Wed, 26 Oct 2016 11:38:45 -0400 Subject: [PATCH 1/1] Moved build_nmh to top level directory. --- INSTALL | 7 +++---- Makefile.am | 4 ++-- docs/contrib/build_nmh => build_nmh | 0 docs/pending-release-notes | 3 +++ 4 files changed, 8 insertions(+), 6 deletions(-) rename docs/contrib/build_nmh => build_nmh (100%) diff --git a/INSTALL b/INSTALL index c6a4077a..ca1c1df5 100644 --- a/INSTALL +++ b/INSTALL @@ -5,10 +5,9 @@ -------------------------------- Installing nmh, guided by script -------------------------------- -For routine installation on popular platforms, the shell script in -docs/contrib/build_nmh can be used to guide you through configuration. -It will then build and optionally (with -i) install in the configured -location. +For routine installation on popular platforms, the build_nmh shell +script can be used to guide you through configuration. It will then +build and optionally (with -i) install in the configured location. ------------------------ diff --git a/Makefile.am b/Makefile.am index b804a4a7..978e5721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -236,7 +236,7 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \ ## Contribs that get installed in docdir/contrib/ ## docs_contribdir = $(docdir)/contrib -dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter docs/contrib/build_nmh \ +dist_docs_contrib_SCRIPTS = docs/contrib/replyfilter \ docs/contrib/localpostproc docs/contrib/ml \ docs/contrib/vpick docs/contrib/replaliases dist_docs_contrib_DATA = docs/contrib/replaliases @@ -286,7 +286,7 @@ man_SRCS = man/MH.man man/ali.man man/anno.man man/ap.man man/burst.man \ ## Files we need to include in the distribution which aren't found by ## Automake using the automatic rules ## -EXTRA_DIST = autogen.sh config/version.sh sbr/icalparse.h \ +EXTRA_DIST = autogen.sh build_nmh config/version.sh sbr/icalparse.h \ etc/mts.conf.in etc/mhn.defaults.sh etc/sendfiles \ $(MHNSEARCHPROG) DATE MACHINES \ docs/ChangeLog_MH-3_to_MH-6.6 \ diff --git a/docs/contrib/build_nmh b/build_nmh similarity index 100% rename from docs/contrib/build_nmh rename to build_nmh diff --git a/docs/pending-release-notes b/docs/pending-release-notes index 8e1aa0d7..5c256046 100644 --- a/docs/pending-release-notes +++ b/docs/pending-release-notes @@ -63,6 +63,9 @@ NEW FEATURES - Single-character headers can be reliably formatted, etc., instead of apparently being missing. - ./configure's --enable-debug has been removed; it did nothing. +- configure now defaults to enabling each of TLS and Cyrus SASL if the + necessary headers and libraries are found. +- Moved build_nmh to top-level directory. ----------------- OBSOLETE FEATURES -- 2.48.1