Moved build_nmh to top level directory.

diff --git a/INSTALL b/INSTALL
index c6a4077acc08b83c4dff9e14ab5c76b8c120a6e6..ca1c1df5958656029a38e44d7cf7a08894a02d22 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -5,10 +5,9 @@
 --------------------------------
 Installing nmh, guided by script
 --------------------------------
 --------------------------------
 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 b804a4a76211af9f100e41e2426809d456658bb7..978e5721bddedb23473c442ed33bcfa4b9b5b0cd 100644 (file)
--- 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
 ## 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
                            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
 ##
 ## 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 \
             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 8e1aa0d7a65169613b5d031cb7b94981268dddba..5c2560463c3399a21f133b4eb0a96df2bc30d4b3 100644 (file)
--- 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.
 - 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
 
 -----------------
 OBSOLETE FEATURES