Add netsec_get_sasl_ssf().

[nmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 074adb263eec78a2d688dcbb5ea9a090e9955143..bd4ee9c145f94659cf330597a480486eaaf4760f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,14 @@
 ## Our Makefile.am template for Makefile.in (and, eventually, Makefile)
 ##
 ## Process this with automake to generate Makefile.in
 ## Our Makefile.am template for Makefile.in (and, eventually, Makefile)
 ##
 ## Process this with automake to generate Makefile.in

+## Lists are in `LC_ALL=C sort' order.

 ##
 
 ## We set this to get our autoconf macros in the m4 directory
 ACLOCAL_AMFLAGS = -I m4
 
 ##
 
 ## We set this to get our autoconf macros in the m4 directory
 ACLOCAL_AMFLAGS = -I m4
 

+AM_YFLAGS = -d
+

 ##
 ## This is the default set of libraries all programs link against.  Some
 ## programs add extra libraries to this set, so they override this with
 ##
 ## This is the default set of libraries all programs link against.  Some
 ## programs add extra libraries to this set, so they override this with


@@ -21,83 +24,188 @@ LDADD = sbr/libmh.a
 ## MHNSEARCHPATH is the default path to look for MIME content handlers
 ## MHNSEARCHPROG is the script used to find the support programs
 ##
 ## MHNSEARCHPATH is the default path to look for MIME content handlers
 ## MHNSEARCHPROG is the script used to find the support programs
 ##

-MHNSEARCHPATH = "$(PATH):/usr/demo/SOUND"
+MHNSEARCHPATH = "$(PATH)"

 MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 
 ##
 MHNSEARCHPROG = $(srcdir)/etc/mhn.find.sh
 
 ##

-## Automake doesn't let us install programs in $(libdir), so we create our
-## own directory prefix to use in the primary variable.
+## Install config files and back-end programs in our own subdirecctories.

 ##
 ##

-auxexecdir = @libdir@
+nmhetcdir  = @sysconfdir@/nmh
+nmhlibexecdir = @libexecdir@/nmh

 
 ##
 ## nmh _does_ have a test suite!
 ##
 TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
 
 ##
 ## nmh _does_ have a test suite!
 ##
 TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \

-                   MH_TEST_DIR="@abs_builddir@/test/testdir" \
-                   auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
-                   mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
+                   MH_VERSION="$(VERSION)" \
+                   OAUTH_SUPPORT='@OAUTH_SUPPORT@' \
+                   CURL_USER_AGENT='@CURL_USER_AGENT@' \
+                   MH_TEST_DIR=`cd "@abs_builddir@" && pwd -P`/test/testdir \
+                   nmhlibexecdir="$(nmhlibexecdir)" bindir="$(bindir)" \
+                   mandir="$(mandir)" nmhetcdir="$(nmhetcdir)" \
+                   nmhetcdirinst="@nmhetcdirinst@$(nmhetcdir)" \

                    supported_locks="$(supported_locks)" \
                    supported_locks="$(supported_locks)" \

+                   default_locking="${default_locking}" \

                    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
                    ICONV_ENABLED=$(ICONV_ENABLED) \
                    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
                    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
                    ICONV_ENABLED=$(ICONV_ENABLED) \
                    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.

+

 ##
 ## Important note: the "cleanup" test should always be last
 ##
 ##
 ## Important note: the "cleanup" test should always be last
 ##

-TESTS = test/ali/test-ali test/anno/test-anno \
-       test/bad-input/test-header \
-       test/burst/test-burst test/burst/test-burst-mime \
-       test/comp/test-comp-format test/dist/test-dist \
-       test/folder/test-create test/folder/test-packf \
-       test/folder/test-recurse test/folder/test-sortm \
-       test/folder/test-total \
-       test/format/test-dp test/format/test-fmtdump \
-       test/format/test-localmbox test/format/test-myname \
-       test/format/test-myhost test/format/test-mymbox \
-       test/format/test-rightjustify \
-       test/forw/test-forw-digest test/forw/test-forw-format \
-       test/inc/test-deb359167 test/inc/test-eom-align \
-       test/inc/test-inc-scanout test/inc/test-msgchk \
-       test/inc/test-pop \
-       test/install-mh/test-install-mh \
-       test/locking/test-datalocking test/locking/test-spoollocking \
-       test/manpages/test-manpages \
-       test/mhbuild/test-forw test/mhbuild/test-utf8-body \
-       test/mhlist/test-mhlist test/mhmail/test-mhmail \
-       test/mhparam/test-mhparam test/mhpath/test-mhpath \
-       test/mhshow/test-cte-binary test/mhshow/test-qp \
-       test/mhshow/test-subpart test/mhshow/test-msg-buffer-boundaries \
-       test/mhstore/test-mhstore test/new/test-basic \
-       test/pick/test-pick test/pick/test-stderr \
-       test/post/test-post-aliases test/post/test-post-basic \
-       test/post/test-post-multiple test/post/test-post-bcc \
-       test/post/test-post-dcc test/post/test-post-fcc \
-       test/post/test-post-multifrom test/post/test-post-envelope \
-       test/post/test-post-group test/post/test-mts test/post/test-messageid \
-       test/post/test-sendfiles test/prompter/test-prompter \
-       test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
-       test/rcv/test-rcvtty test/refile/test-refile \
-       test/repl/test-if-str test/repl/test-trailing-newline \
-       test/repl/test-multicomp test/repl/test-repl \
-       test/scan/test-scan test/scan/test-scan-multibyte \
-       test/sequences/test-flist test/sequences/test-mark \
-       test/sequences/test-out-of-range \
-       test/slocal/test-slocal \
-       test/whatnow/test-attach-detach test/whatnow/test-cd \
-       test/whatnow/test-ls test/whom/test-whom \
-       test/cleanup ## The "cleanup" test should always be last.
+TESTS = \
+    test/ali/test-ali \
+    test/anno/test-anno \
+    test/bad-input/test-header \
+    test/burst/test-burst \
+    test/burst/test-burst-mime \
+    test/comp/test-comp-format \
+    test/dist/test-dist \
+    test/folder/test-coverage \
+    test/folder/test-create \
+    test/folder/test-nocreate \
+    test/folder/test-packf \
+    test/folder/test-recurse \
+    test/folder/test-sortm \
+    test/folder/test-total \
+    test/format/test-ap \
+    test/format/test-curses \
+    test/format/test-dp \
+    test/format/test-fmtdump \
+    test/format/test-functions \
+    test/format/test-localmbox \
+    test/format/test-myhost \
+    test/format/test-mymbox \
+    test/format/test-myname \
+    test/format/test-nullstr \
+    test/format/test-rightjustify \
+    test/format/test-unquote \
+    test/forw/test-forw-coverage \
+    test/forw/test-forw-digest \
+    test/forw/test-forw-format \
+    test/inc/test-deb359167 \
+    test/inc/test-eom-align \
+    test/inc/test-inc-scanout \
+    test/inc/test-msgchk \
+    test/inc/test-pop \
+    test/install-mh/test-install-mh \
+    test/install-mh/test-version-check \
+    test/locking/test-datalocking \
+    test/locking/test-spoollocking \
+    test/manpages/test-manpages \
+    test/mhbuild/test-attach \
+    test/mhbuild/test-cte \
+    test/mhbuild/test-ext-params \
+    test/mhbuild/test-forw \
+    test/mhbuild/test-header-encode \
+    test/mhbuild/test-mhbuild \
+    test/mhbuild/test-utf8-body \
+    test/mhfixmsg/test-mhfixmsg \
+    test/mhical/test-mhical \
+    test/mhl/test-mhl-flags \
+    test/mhl/test-rfc6532 \
+    test/mhlist/test-ext-params \
+    test/mhlist/test-mhlist \
+    test/mhmail/test-mhmail \
+    test/mhparam/test-mhparam \
+    test/mhpath/test-mhpath \
+    test/mhshow/test-binary \
+    test/mhshow/test-charset \
+    test/mhshow/test-cte-binary \
+    test/mhshow/test-msg-buffer-boundaries \
+    test/mhshow/test-qp \
+    test/mhshow/test-subpart \
+    test/mhshow/test-textcharset \
+    test/mhstore/test-mhstore \
+    test/mkstemp/test-mkstemp \
+    test/new/test-basic \
+    test/oauth/test-inc \
+    test/oauth/test-mhlogin \
+    test/oauth/test-mhparam \
+    test/oauth/test-send \
+    test/oauth/test-sendfrom \
+    test/oauth/test-share \
+    test/pick/test-pick \
+    test/pick/test-stderr \
+    test/post/test-messageid \
+    test/post/test-mts \
+    test/post/test-post-aliases \
+    test/post/test-post-basic \
+    test/post/test-post-bcc \
+    test/post/test-post-dcc \
+    test/post/test-post-envelope \
+    test/post/test-post-fcc \
+    test/post/test-post-group \
+    test/post/test-post-multifrom \
+    test/post/test-post-multiple \
+    test/post/test-rfc6531 \
+    test/post/test-sendfiles \
+    test/prompter/test-prompter \
+    test/rcv/test-rcvdist \
+    test/rcv/test-rcvpack \
+    test/rcv/test-rcvstore \
+    test/rcv/test-rcvtty \
+    test/refile/test-refile \
+    test/repl/test-convert \
+    test/repl/test-if-str \
+    test/repl/test-multicomp \
+    test/repl/test-repl \
+    test/repl/test-trailing-newline \
+    test/scan/test-header-parsing \
+    test/scan/test-scan \
+    test/scan/test-scan-multibyte \
+    test/send/test-sendfrom \
+    test/sequences/test-flist \
+    test/sequences/test-mark \
+    test/sequences/test-out-of-range \
+    test/show/test-show \
+    test/slocal/test-slocal \
+    test/whatnow/test-attach-detach \
+    test/whatnow/test-cd \
+    test/whatnow/test-ls \
+    test/whom/test-whom \
+    test/cleanup ## The "cleanup" test should always be last.
+
+XFAIL_TESTS =

 
 check_SCRIPTS = test/common.sh
 
 check_SCRIPTS = test/common.sh

-check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp \
-                test/getcwidth
-DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
+
+check_PROGRAMS = \
+    test/fakehttp \
+    test/fakepop \
+    test/fakesmtp \
+    test/getcanon \
+    test/getcwidth \
+    test/getfullname \
+    test/runpty \
+    #
+
+## So they can be built without builing the `check' target.
+check-programs: $(check_PROGRAMS)
+
+## The location of installed nmhetcdir is, for all purposes except
+## distcheck, $nmhetcdir.  For distcheck, prepend $MH_INST_DIR (from
+## test/common.sh.in), which is based on $MH_TEST_DIR (from
+## $TESTS_ENVIRONMENT).
+AM_DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
+                       NMHETCDIRINST='$${abs_builddir}/test/testdir/inst'

 
 ##
 ## Stuff that should be cleaned via "make clean"
 
 ##
 ## Stuff that should be cleaned via "make clean"

-##
-CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf \
-            etc/gen-ctype-checked sbr/ctype-checked.h sbr/ctype-checked.c \
-            etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
+## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
+##
+CLEANFILES = \
+    $(man_MANS) \
+    *.plist \
+    config/version.c \
+    etc/bash_completion_nmh \
+    etc/mhn.defaults \
+    etc/mts.conf \
+    man/man.sed \
+    man/mh-chart.man \
+    sbr/dtimep.c \
+    #
+

 clean-local:
        @rm -rf RPM a.out.dSYM uip/a.out.dSYM
        @rm -rf test/testdir
 clean-local:
        @rm -rf RPM a.out.dSYM uip/a.out.dSYM
        @rm -rf test/testdir


@@ -105,161 +213,456 @@ clean-local:
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
 ##
 ##
 ## Stuff that should be cleaned via "make maintainer-clean"
 ##

-MAINTAINERCLEANFILES = cscope.files cscope.out cscope.in.out cscope.po.out
+MAINTAINERCLEANFILES = \
+    *.plist \
+    atags \
+    cscope.files \
+    cscope.in.out \
+    cscope.out \
+    cscope.po.out \
+    #

 
 ##
 ## And our own superclean, to get everything left by maintainer-clean.
 ##
 
 ##
 ## And our own superclean, to get everything left by maintainer-clean.
 ##

-SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \
-                 config.h.in config.h.in~ config.sub configure depcomp \
-                 install-sh missing ylwrap nmh-*.tar.gz nmh-*.tar.gz.sig
+SUPERCLEANFILES = \
+    ChangeLog \
+    Makefile.in \
+    aclocal.m4 \
+    compile \
+    config.guess \
+    config.h.in \
+    config.h.in~ \
+    config.sub \
+    configure \
+    depcomp \
+    install-sh \
+    missing \
+    nmh-*.tar.gz \
+    nmh-*.tar.gz.sig \
+    test-driver \
+    ylwrap \
+    #
+

 superclean: maintainer-clean
        @rm -f $(SUPERCLEANFILES)
 .PHONY: superclean
 
 superclean: maintainer-clean
        @rm -f $(SUPERCLEANFILES)
 .PHONY: superclean
 

-##
-## Files that need to be built before everything else
-##
-BUILT_SOURCES = sbr/sigmsg.h sbr/ctype-checked.c
-

 ##
 ## This is a list of all programs that get installed in the "bin" directory
 ## Note that primary difference between "PROGRAMS" and "SCRIPTS" is that
 ## the latter do not have $(EXEEXT) added on the end.
 ##
 ##
 ## This is a list of all programs that get installed in the "bin" directory
 ## Note that primary difference between "PROGRAMS" and "SCRIPTS" is that
 ## the latter do not have $(EXEEXT) added on the end.
 ##

-bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
-              uip/fmttest uip/folder uip/forw uip/inc uip/install-mh \
-              uip/mark uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
-              uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
-              uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
-              uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
-              uip/whom
-
-bin_SCRIPTS = uip/mhmail etc/sendfiles
-
-##
-## This is all programs that get installed in the "lib" directory
-##
-auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
-                  uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \
-                  uip/viamail uip/mhtest
-
-auxexec_SCRIPTS = uip/spost
-
-##
-## Programs that MAY need to get built at some point; we need to list them
-## here if they don't appear in any other primary so Automake knows about
-## them and can properly record dependency information.
-##
-EXTRA_PROGRAMS = etc/gen-ctype-checked
+bin_PROGRAMS = \
+    uip/ali \
+    uip/anno \
+    uip/burst \
+    uip/comp \
+    uip/dist \
+    uip/flist \
+    uip/fmttest \
+    uip/folder \
+    uip/forw \
+    uip/inc \
+    uip/install-mh \
+    uip/mark \
+    uip/mhbuild \
+    uip/mhfixmsg \
+    uip/mhical \
+    uip/mhlist \
+    uip/mhlogin \
+    uip/mhn \
+    uip/mhparam \
+    uip/mhpath \
+    uip/mhshow \
+    uip/mhstore \
+    uip/msgchk \
+    uip/new \
+    uip/packf \
+    uip/pick \
+    uip/prompter \
+    uip/refile \
+    uip/repl \
+    uip/rmf \
+    uip/rmm \
+    uip/scan \
+    uip/send \
+    uip/show \
+    uip/sortm \
+    uip/whatnow \
+    uip/whom \
+    #
+
+noinst_PROGRAMS = \
+    uip/imaptest \
+    #
+
+bin_SCRIPTS = \
+    etc/sendfiles \
+    uip/mhmail \
+    #
+
+##
+## This is all programs that get installed in the "libexec/nmh" directory
+##
+nmhlibexec_PROGRAMS = \
+    uip/ap \
+    uip/dp \
+    uip/fmtdump \
+    uip/mhl \
+    uip/mkstemp \
+    uip/post \
+    uip/rcvdist \
+    uip/rcvpack \
+    uip/rcvstore \
+    uip/rcvtty \
+    uip/slocal \
+    uip/viamail \
+    #
+
+nmhlibexec_SCRIPTS = uip/spost

 
 ##
 ## Internal libraries that we create as part of the build process
 ## but do not install
 ##
 
 ##
 ## Internal libraries that we create as part of the build process
 ## but do not install
 ##

-noinst_LIBRARIES = sbr/libmh.a mts/libmts.a
+noinst_LIBRARIES = \
+    mts/libmts.a \
+    sbr/libmh.a \
+    #

 
 ##
 ## These are all of our header files.  Right now we don't install any of
 ## them, but that might change in the future.
 ##
 
 ##
 ## These are all of our header files.  Right now we don't install any of
 ## them, but that might change in the future.
 ##

-noinst_HEADERS = h/addrsbr.h h/aliasbr.h h/crawl_folders.h h/dropsbr.h \
-                h/fmt_compile.h h/fmt_scan.h h/md5.h h/mf.h \
-                h/mh.h h/mhcachesbr.h h/mhparse.h h/mime.h h/msh.h \
-                h/mts.h h/nmh.h h/picksbr.h h/popsbr.h h/prototypes.h \
-                h/rcvmail.h h/scansbr.h h/signals.h h/tws.h h/utils.h \
-                h/vmhsbr.h mts/smtp/smtp.h sbr/ctype-checked.h
+noinst_HEADERS = \
+    h/addrsbr.h \
+    h/aliasbr.h \
+    h/crawl_folders.h \
+    h/done.h \
+    h/dropsbr.h \
+    h/fmt_compile.h \
+    h/fmt_scan.h \
+    h/icalendar.h \
+    h/md5.h \
+    h/mf.h \
+    h/mh.h \
+    h/mhcachesbr.h \
+    h/mhparse.h \
+    h/mime.h \
+    h/mts.h \
+    h/netsec.h \
+    h/nmh.h \
+    h/oauth.h \
+    h/picksbr.h \
+    h/popsbr.h \
+    h/prototypes.h \
+    h/rcvmail.h \
+    h/scansbr.h \
+    h/signals.h \
+    h/tws.h \
+    h/utils.h \
+    mts/smtp/smtp.h \
+    sbr/base64.h \
+    sbr/ctype-checked.h \
+    sbr/lock_file.h \
+    sbr/m_maildir.h \
+    sbr/m_mktemp.h \
+    sbr/m_popen.h \
+    sbr/m_rand.h \
+    sbr/makedir.h \
+    sbr/message_id.h \
+    sbr/mime_type.h \
+    sbr/read_line.h \
+    sbr/terminal.h \
+    sbr/unquote.h \
+    thirdparty/jsmn/jsmn.h \
+    uip/mhfree.h \
+    uip/mhmisc.h \
+    uip/mhoutsbr.h \
+    uip/mhshowsbr.h \
+    #

 
 ##
 ## Extra files we need to install in various places
 ##
 
 ##
 ## Extra files we need to install in various places
 ##

-dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \
-                   etc/distcomps etc/forwcomps etc/mhl.body etc/mhl.digest \
-                   etc/mhl.format etc/mhl.forward etc/mhl.headers \
-                   etc/mhl.reply etc/rcvdistcomps etc/rcvdistcomps.outbox \
-                   etc/replcomps etc/replgroupcomps etc/scan.MMDDYY \
-                   etc/scan.YYYYMMDD etc/scan.default etc/scan.highlighted \
-                   etc/scan.mailx etc/scan.nomime etc/scan.size etc/scan.time \
-                   etc/scan.timely etc/scan.unseen
+dist_nmhetc_DATA = \
+    etc/MailAliases \
+    etc/components \
+    etc/digestcomps \
+    etc/distcomps \
+    etc/forwcomps \
+    etc/mhical.12hour \
+    etc/mhical.24hour \
+    etc/mhl.body \
+    etc/mhl.digest \
+    etc/mhl.format \
+    etc/mhl.forward \
+    etc/mhl.headers \
+    etc/mhl.reply \
+    etc/mhl.replywithoutbody \
+    etc/mhshow.marker \
+    etc/rcvdistcomps \
+    etc/rcvdistcomps.outbox \
+    etc/replcomps \
+    etc/replgroupcomps \
+    etc/rmmproc.messageid \
+    etc/scan.MMDDYY \
+    etc/scan.YYYYMMDD \
+    etc/scan.curses \
+    etc/scan.default \
+    etc/scan.highlighted \
+    etc/scan.mailx \
+    etc/scan.nomime \
+    etc/scan.size \
+    etc/scan.time \
+    etc/scan.timely \
+    etc/scan.unseen \
+    #

 
 ##
 ## The same as above, but we don't include these in the distribution
 ## (because they're generated at compile time)
 ##
 
 ##
 ## The same as above, but we don't include these in the distribution
 ## (because they're generated at compile time)
 ##

-sysconf_DATA = etc/mhn.defaults etc/mts.conf
+nmhetc_DATA = \
+    etc/bash_completion_nmh \
+    etc/mhn.defaults \
+    etc/mts.conf \
+    #

 
 ##
 ## Documentation that gets installed in docdir
 ##
 
 ##
 ## Documentation that gets installed in docdir
 ##

-dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
-               docs/COMPLETION-BASH docs/COMPLETION-TCSH \
-               docs/COMPLETION-ZSH docs/DIFFERENCES docs/FAQ \
-               docs/MAIL.FILTERING docs/MAILING-LISTS docs/README-ATTACHMENTS \
-               docs/README-HOOKS docs/README-components docs/README.about \
-               docs/README.SASL docs/README.developers docs/README.manpages \
-               docs/TODO
+dist_doc_DATA = \
+    COPYRIGHT \
+    INSTALL \
+    NEWS \
+    README \
+    VERSION \
+    docs/COMPLETION-TCSH \
+    docs/COMPLETION-ZSH \
+    docs/DIFFERENCES \
+    docs/FAQ \
+    docs/MAIL.FILTERING \
+    docs/MAILING-LISTS \
+    docs/README-ATTACHMENTS \
+    docs/README-HOOKS \
+    docs/README-components \
+    docs/README.SASL \
+    docs/README.about \
+    docs/README.developers \
+    docs/README.manpages \
+    docs/TODO \
+    #

 
 ##
 ## Contribs that get installed in docdir/contrib/
 ##
 
 ##
 ## Contribs that get installed in docdir/contrib/
 ##

-contribdir = $(docdir)/contrib
-dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \
-                   docs/contrib/ml
+docs_contribdir = $(docdir)/contrib
+dist_docs_contrib_SCRIPTS = \
+    docs/contrib/localpostproc \
+    docs/contrib/ml \
+    docs/contrib/replaliases \
+    docs/contrib/replyfilter \
+    docs/contrib/vpick \
+    #
+
+dist_docs_contrib_DATA = docs/contrib/replaliases

 
 ##
 ## Our man pages
 ##
 
 ##
 ## Our man pages
 ##

-man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
-          man/conflict.8 man/dist.1 man/dp.8 man/flist.1 man/flists.1 \
-          man/fmtdump.8 man/fmttest.1 man/fnext.1 man/folder.1 man/folders.1 \
-          man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
-          man/mh-alias.5 man/mh-chart.7 man/mh-draft.5 man/mh-folders.5 \
-          man/mh-format.5 man/mh-mail.5 man/mh-profile.5 man/mh_profile.5 \
-          man/mh-sequence.5 man/mh-tailor.5 man/mhbuild.1 man/mhl.1 \
-          man/mhlist.1 man/mhmail.1 man/mhn.1 man/mhparam.1 man/mhpath.1 \
-          man/mhshow.1 man/mhstore.1 man/msgchk.1 man/msh.1 \
-          man/mts.conf.5 man/new.1 man/next.1 man/nmh.7 man/packf.1 \
-          man/pick.1 man/post.8 man/prev.1 man/prompter.1 man/rcvdist.1 \
-          man/rcvpack.1 man/rcvstore.1 man/rcvtty.1 man/refile.1 \
-          man/repl.1 man/rmf.1 man/rmm.1 man/scan.1 man/send.1 \
-          man/sendfiles.1 man/show.1 man/slocal.1 man/sortm.1 man/unseen.1 \
-          man/whatnow.1 man/whom.1
+man_MANS = \
+    man/MH.7 \
+    man/ali.1 \
+    man/anno.1 \
+    man/ap.8 \
+    man/burst.1 \
+    man/comp.1 \
+    man/dist.1 \
+    man/dp.8 \
+    man/flist.1 \
+    man/flists.1 \
+    man/fmtdump.8 \
+    man/fmttest.1 \
+    man/fnext.1 \
+    man/folder.1 \
+    man/folders.1 \
+    man/forw.1 \
+    man/fprev.1 \
+    man/inc.1 \
+    man/install-mh.1 \
+    man/mark.1 \
+    man/mh-alias.5 \
+    man/mh-chart.7 \
+    man/mh-draft.5 \
+    man/mh-folders.5 \
+    man/mh-format.5 \
+    man/mh-mail.5 \
+    man/mh-mime.7 \
+    man/mh-mkstemp.1 \
+    man/mh-profile.5 \
+    man/mh-sequence.5 \
+    man/mh-tailor.5 \
+    man/mh_profile.5 \
+    man/mhbuild.1 \
+    man/mhfixmsg.1 \
+    man/mhical.1 \
+    man/mhl.1 \
+    man/mhlist.1 \
+    man/mhlogin.1 \
+    man/mhmail.1 \
+    man/mhn.1 \
+    man/mhparam.1 \
+    man/mhpath.1 \
+    man/mhshow.1 \
+    man/mhstore.1 \
+    man/msgchk.1 \
+    man/mts.conf.5 \
+    man/new.1 \
+    man/next.1 \
+    man/nmh.7 \
+    man/packf.1 \
+    man/pick.1 \
+    man/post.8 \
+    man/prev.1 \
+    man/prompter.1 \
+    man/rcvdist.1 \
+    man/rcvpack.1 \
+    man/rcvstore.1 \
+    man/rcvtty.1 \
+    man/refile.1 \
+    man/repl.1 \
+    man/rmf.1 \
+    man/rmm.1 \
+    man/scan.1 \
+    man/send.1 \
+    man/sendfiles.1 \
+    man/show.1 \
+    man/slocal.1 \
+    man/sortm.1 \
+    man/unseen.1 \
+    man/whatnow.1 \
+    man/whom.1 \
+    #

 
 ##
 ## Sources for our man pages
 ##
 
 ##
 ## Sources for our man pages
 ##

-man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
-          man/conflict.man man/dist.man man/dp.man man/flist.man \
-          man/flists.man man/fmtdump.man man/fmttest.man man/fnext.man \
-          man/folder.man man/folders.man man/forw.man man/fprev.man \
-          man/inc.man man/install-mh.man man/mark.man man/mh-alias.man \
-          man/mh-chart-gen.sh man/mh-draft.man man/mh-folders.man \
-          man/mh-format.man man/mh-mail.man man/mh-profile.man \
-          man/mh_profile.man man/mh-sequence.man man/mh-tailor.man \
-          man/mhbuild.man man/mhl.man man/mhlist.man man/mhmail.man \
-          man/mhn.man man/mhparam.man man/mhpath.man man/mhshow.man \
-          man/mhstore.man man/msgchk.man man/msh.man man/mts.conf.man \
-          man/new.man man/next.man man/nmh.man \
-          man/packf.man man/pick.man man/post.man man/prev.man \
-          man/prompter.man man/rcvdist.man man/rcvpack.man \
-          man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
-          man/rmf.man man/rmm.man man/scan.man man/send.man \
-          man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
-          man/unseen.man man/whatnow.man man/whom.man
+man_SRCS = \
+    man/MH.man \
+    man/ali.man \
+    man/anno.man \
+    man/ap.man \
+    man/burst.man \
+    man/comp.man \
+    man/dist.man \
+    man/dp.man \
+    man/flist.man \
+    man/flists.man \
+    man/fmtdump.man \
+    man/fmttest.man \
+    man/fnext.man \
+    man/folder.man \
+    man/folders.man \
+    man/forw.man \
+    man/fprev.man \
+    man/inc.man \
+    man/install-mh.man \
+    man/mark.man \
+    man/mh-alias.man \
+    man/mh-chart-gen.sh \
+    man/mh-draft.man \
+    man/mh-folders.man \
+    man/mh-format.man \
+    man/mh-mail.man \
+    man/mh-mime.man \
+    man/mh-mkstemp.man \
+    man/mh-profile.man \
+    man/mh-sequence.man \
+    man/mh-tailor.man \
+    man/mh_profile.man \
+    man/mhbuild.man \
+    man/mhfixmsg.man \
+    man/mhical.man \
+    man/mhl.man \
+    man/mhlist.man \
+    man/mhlogin.man \
+    man/mhmail.man \
+    man/mhn.man \
+    man/mhparam.man \
+    man/mhpath.man \
+    man/mhshow.man \
+    man/mhstore.man \
+    man/msgchk.man \
+    man/mts.conf.man \
+    man/new.man \
+    man/next.man \
+    man/nmh.man \
+    man/packf.man \
+    man/pick.man \
+    man/post.man \
+    man/prev.man \
+    man/prompter.man \
+    man/rcvdist.man \
+    man/rcvpack.man \
+    man/rcvstore.man \
+    man/rcvtty.man \
+    man/refile.man \
+    man/repl.man \
+    man/rmf.man \
+    man/rmm.man \
+    man/scan.man \
+    man/send.man \
+    man/sendfiles.man \
+    man/show.man \
+    man/slocal.man \
+    man/sortm.man \
+    man/unseen.man \
+    man/whatnow.man \
+    man/whom.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 = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
-            etc/mhn.defaults.sh etc/sendfiles $(MHNSEARCHPROG) DATE MACHINES \
-            docs/ChangeLog_MH-3_to_MH-6.6 \
-            docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
-            test/README test/fakesendmail $(TESTS) test/inc/deb359167.mbox \
-            test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
-            test/inc/md5sums test/mhmail/attachment.txt \
-            test/post/test-post-common.sh uip/mhmail \
-            SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS)
+EXTRA_DIST = \
+    $(MHNSEARCHPROG) \
+    $(TESTS) \
+    $(man_SRCS) \
+    DATE \
+    MACHINES \
+    SPECS/nmh.cygport \
+    SPECS/nmh.spec \
+    autogen.sh \
+    build_nmh \
+    config/version.sh \
+    docs/ChangeLog_MH-3_to_MH-6.6 \
+    docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
+    etc/bash_completion_nmh-gen \
+    etc/mhn.defaults.sh \
+    etc/mts.conf.in \
+    etc/sendfiles \
+    sbr/icalparse.h \
+    test/README \
+    test/fakesendmail \
+    test/inc/deb359167.mbox \
+    test/inc/filler.txt \
+    test/inc/fromline.txt \
+    test/inc/md5sums \
+    test/inc/msgheader.txt \
+    test/mhbuild/nulls \
+    test/mhbuild/somebinary \
+    test/mhbuild/textplain \
+    test/mhbuild/tiny.jpg \
+    test/mhmail/attachment.txt \
+    test/oauth/common.sh \
+    test/post/test-post-common.sh \
+    test/send/README \
+    test/valgrind.supp \
+    uip/mhmail \
+    #

 
 ##
 ## These are all of the definitions for each of the programs listed above.
 
 ##
 ## These are all of the definitions for each of the programs listed above.


@@ -267,190 +670,226 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
 ## overrides that are used to select different library options from the
 ## default.
 ##
 ## overrides that are used to select different library options from the
 ## default.
 ##

+POSTLINK = @POSTLINK@
+

 uip_ali_SOURCES = uip/ali.c uip/aliasbr.c
 uip_ali_SOURCES = uip/ali.c uip/aliasbr.c

+uip_ali_LDADD = $(LDADD) $(POSTLINK)

 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c
 
 uip_anno_SOURCES = uip/anno.c uip/annosbr.c

+uip_anno_LDADD = $(LDADD) $(POSTLINK)

 
 uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \
 
 uip_burst_SOURCES = uip/burst.c uip/mhparse.c uip/mhmisc.c uip/mhfree.c \

-                   uip/mhcachesbr.c uip/md5.c
+                   uip/mhcachesbr.c
+uip_burst_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)

 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c
 
 uip_comp_SOURCES = uip/comp.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c

-uip_comp_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_comp_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 
 uip_dist_SOURCES = uip/dist.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c

-uip_dist_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_dist_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_flist_SOURCES = uip/flist.c
 
 uip_flist_SOURCES = uip/flist.c

+uip_flist_LDADD = $(LDADD) $(POSTLINK)

 
 uip_folder_SOURCES = uip/folder.c
 
 uip_folder_SOURCES = uip/folder.c

+uip_folder_LDADD = $(LDADD) $(POSTLINK)

 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c
 
 uip_forw_SOURCES = uip/forw.c uip/whatnowproc.c uip/whatnowsbr.c uip/sendsbr.c \
                   uip/annosbr.c uip/distsbr.c uip/forwsbr.c

-uip_forw_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+
+uip_imaptest_SOURCES = uip/imaptest.c
+uip_imaptest_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) $(POSTLINK)

 
 

-uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/termsbr.c \
-                 uip/popsbr.c
-uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB)
+uip_inc_SOURCES = uip/inc.c uip/scansbr.c uip/dropsbr.c uip/popsbr.c
+uip_inc_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(SASLLIB) $(CURLLIB) \
+               $(TLSLIB) $(POSTLINK)

 
 uip_install_mh_SOURCES = uip/install-mh.c
 
 uip_install_mh_SOURCES = uip/install-mh.c

+uip_install_mh_LDADD = $(LDADD) $(POSTLINK)

 
 uip_mark_SOURCES = uip/mark.c
 
 uip_mark_SOURCES = uip/mark.c

+uip_mark_LDADD = $(LDADD) $(POSTLINK)

 
 uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
                      uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c  \
 
 uip_mhbuild_SOURCES = uip/mhbuild.c uip/mhbuildsbr.c uip/mhcachesbr.c \
                      uip/mhlistsbr.c uip/mhoutsbr.c uip/mhmisc.c  \

-                     uip/mhfree.c uip/mhparse.c uip/termsbr.c uip/md5.c
-uip_mhbuild_LDADD = $(LDADD) $(TERMLIB)
+                     uip/mhfree.c uip/mhparse.c \
+                     uip/mhstoresbr.c uip/mhshowsbr.c
+uip_mhbuild_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+
+uip_mhfixmsg_SOURCES = uip/mhfixmsg.c uip/mhparse.c uip/mhcachesbr.c \
+                      uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
+                      uip/mhshowsbr.c uip/mhlistsbr.c
+uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+
+uip_mhical_SOURCES = uip/mhical.c
+uip_mhical_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
 
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \

-                    uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/termsbr.c \
-                    uip/md5.c
-uip_mhlist_LDADD = $(LDADD) $(TERMLIB)
+                    uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c
+uip_mhlist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \
 
 uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \

-                 uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \
-                 uip/termsbr.c uip/md5.c
-uip_mhn_LDADD = $(LDADD) $(TERMLIB)
+                 uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c
+uip_mhn_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_mhparam_SOURCES = uip/mhparam.c
 
 uip_mhparam_SOURCES = uip/mhparam.c

+uip_mhparam_LDADD = $(LDADD) $(POSTLINK)

 
 uip_mhpath_SOURCES = uip/mhpath.c
 
 uip_mhpath_SOURCES = uip/mhpath.c

+uip_mhpath_LDADD = $(LDADD) $(POSTLINK)

 
 uip_mhshow_SOURCES = uip/mhshow.c uip/mhparse.c uip/mhcachesbr.c \
                     uip/mhshowsbr.c uip/mhlistsbr.c uip/mhmisc.c \
 
 uip_mhshow_SOURCES = uip/mhshow.c uip/mhparse.c uip/mhcachesbr.c \
                     uip/mhshowsbr.c uip/mhlistsbr.c uip/mhmisc.c \

-                    uip/mhfree.c uip/termsbr.c uip/md5.c
-uip_mhshow_LDADD = $(LDADD) $(TERMLIB)
+                    uip/mhfree.c
+uip_mhshow_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
                      uip/mhshowsbr.c uip/mhlistsbr.c uip/mhstoresbr.c \
 
 uip_mhstore_SOURCES = uip/mhstore.c uip/mhparse.c uip/mhcachesbr.c \
                      uip/mhshowsbr.c uip/mhlistsbr.c uip/mhstoresbr.c \

-                     uip/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
-uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
+                     uip/mhmisc.c uip/mhfree.c
+uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
 
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c

-uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
-
-uip_msh_SOURCES = uip/msh.c uip/mshcmds.c uip/vmhsbr.c uip/picksbr.c \
-                 uip/scansbr.c uip/dropsbr.c uip/mhlsbr.c uip/termsbr.c
-uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) $(POSTLINK)

 
 uip_new_SOURCES = uip/new.c
 
 uip_new_SOURCES = uip/new.c

+uip_new_LDADD = $(LDADD) $(POSTLINK)

 
 uip_packf_SOURCES = uip/packf.c uip/dropsbr.c
 
 uip_packf_SOURCES = uip/packf.c uip/dropsbr.c

+uip_packf_LDADD = $(LDADD) $(POSTLINK)

 
 uip_pick_SOURCES = uip/pick.c uip/picksbr.c
 
 uip_pick_SOURCES = uip/pick.c uip/picksbr.c

-uip_pick_LDADD = $(LDADD) $(ICONVLIB)
+uip_pick_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)

 
 uip_prompter_SOURCES = uip/prompter.c
 
 uip_prompter_SOURCES = uip/prompter.c

+uip_prompter_LDADD = $(LDADD) $(POSTLINK)

 
 uip_refile_SOURCES = uip/refile.c
 
 uip_refile_SOURCES = uip/refile.c

+uip_refile_LDADD = $(LDADD) $(POSTLINK)

 
 

-uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c \
-                  uip/whatnowsbr.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
-uip_repl_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_repl_SOURCES = uip/repl.c uip/replsbr.c uip/whatnowproc.c uip/whatnowsbr.c \
+                  uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+uip_repl_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_rmf_SOURCES = uip/rmf.c
 
 uip_rmf_SOURCES = uip/rmf.c

+uip_rmf_LDADD = $(LDADD) $(POSTLINK)

 
 uip_rmm_SOURCES = uip/rmm.c
 
 uip_rmm_SOURCES = uip/rmm.c

+uip_rmm_LDADD = $(LDADD) $(POSTLINK)

 
 

-uip_scan_SOURCES = uip/scan.c uip/scansbr.c uip/termsbr.c
-uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_scan_SOURCES = uip/scan.c uip/scansbr.c
+uip_scan_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 

-uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c uip/distsbr.c
+uip_send_SOURCES = uip/send.c uip/sendsbr.c uip/annosbr.c \
+                  uip/distsbr.c
+uip_send_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 

-uip_show_SOURCES = uip/show.c uip/mhlsbr.c uip/termsbr.c
-uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_show_SOURCES = uip/show.c uip/mhlsbr.c
+uip_show_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_sortm_SOURCES = uip/sortm.c
 
 uip_sortm_SOURCES = uip/sortm.c

+uip_sortm_LDADD = $(LDADD) $(POSTLINK)

 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c
 
 uip_whatnow_SOURCES = uip/whatnow.c uip/whatnowsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c

-uip_whatnow_LDADD = $(LDADD) $(READLINELIB)
+uip_whatnow_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c

+uip_whom_LDADD = $(LDADD) $(POSTLINK)

 
 ##
 
 ##

-## Programs definitions for all utilities that end up in $(libdir)
+## Program definitions for all utilities that end up in $(nmhlibexecdir)

 ##
 
 ##
 

-uip_ap_SOURCES = uip/ap.c uip/termsbr.c
-uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
-
-uip_conflict_SOURCES = uip/conflict.c uip/aliasbr.c
+uip_ap_SOURCES = uip/ap.c
+uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 

-uip_dp_SOURCES = uip/dp.c uip/termsbr.c
-uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_dp_SOURCES = uip/dp.c
+uip_dp_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_fmtdump_SOURCES = uip/fmtdump.c
 
 uip_fmtdump_SOURCES = uip/fmtdump.c

-uip_fmtdump_LDADD = $(LDADD) $(ICONVLIB)
+uip_fmtdump_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 

-uip_fmttest_SOURCES = uip/fmttest.c uip/termsbr.c
-uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_fmttest_SOURCES = uip/fmttest.c
+uip_fmttest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 

-uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c uip/termsbr.c
-uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_mhl_SOURCES = uip/mhl.c uip/mhlsbr.c
+uip_mhl_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 

-uip_mhtest_SOURCES = uip/mhtest.c uip/mhparse.c uip/mhcachesbr.c \
-                    uip/mhoutsbr.c uip/mhmisc.c uip/mhfree.c \
-                    uip/termsbr.c uip/md5.c
-uip_mhtest_LDADD = $(LDADD) $(TERMLIB)
+uip_mhlogin_SOURCES = uip/mhlogin.c
+uip_mhlogin_LDADD = mts/libmts.a $(LDADD) $(CURLLIB) $(POSTLINK)
+
+uip_mkstemp_SOURCES = uip/mkstemp.c
+uip_mkstemp_LDADD = $(LDADD) $(POSTLINK)

 
 uip_post_SOURCES = uip/post.c uip/aliasbr.c
 
 uip_post_SOURCES = uip/post.c uip/aliasbr.c

-uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(TLSLIB)
+uip_post_LDADD = mts/libmts.a $(LDADD) $(SASLLIB) $(CURLLIB) $(TLSLIB) \
+                $(POSTLINK)

 
 uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c
 
 uip_rcvdist_SOURCES = uip/rcvdist.c uip/distsbr.c

-uip_rcvdist_LDADD = $(LDADD) $(ICONVLIB)
+uip_rcvdist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_rcvpack_SOURCES = uip/rcvpack.c uip/dropsbr.c
 
 uip_rcvpack_SOURCES = uip/rcvpack.c uip/dropsbr.c

+uip_rcvpack_LDADD = $(LDADD) $(POSTLINK)

 
 uip_rcvstore_SOURCES = uip/rcvstore.c
 
 uip_rcvstore_SOURCES = uip/rcvstore.c

+uip_rcvstore_LDADD = $(LDADD) $(POSTLINK)

 
 

-uip_rcvtty_SOURCES = uip/rcvtty.c uip/scansbr.c uip/termsbr.c
-uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_rcvtty_SOURCES = uip/rcvtty.c uip/scansbr.c
+uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)

 
 uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
 
 uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c

-uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS)
+uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) $(POSTLINK)

 
 

-uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
+uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/sendsbr.c \

                      uip/annosbr.c uip/distsbr.c
                      uip/annosbr.c uip/distsbr.c

+uip_viamail_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+
+##
+## Other program definitions
+##

 
 test_getfullname_SOURCES = test/getfullname.c
 
 test_getfullname_SOURCES = test/getfullname.c

-test_getfullname_LDADD = sbr/libmh.a
+test_getfullname_LDADD = $(LDADD) $(POSTLINK)

 
 

-test_getfqdn_SOURCES = test/getfqdn.c
-test_getfqdn_LDADD =
+test_getcanon_SOURCES = test/getcanon.c
+test_getcanon_LDADD = $(POSTLINK)

 
 

-test_fakepop_SOURCES = test/fakepop.c
-test_fakepop_LDADD =
+test_fakepop_SOURCES = test/fakepop.c test/server.c
+test_fakepop_LDADD = $(POSTLINK)

 
 

-test_fakesmtp_SOURCES = test/fakesmtp.c
-test_fakesmtp_LDADD =
+test_fakesmtp_SOURCES = test/fakesmtp.c test/server.c
+test_fakesmtp_LDADD = $(POSTLINK)
+
+test_fakehttp_SOURCES = test/fakehttp.c test/server.c
+test_fakehttp_LDADD = $(LDADD) $(POSTLINK)

 
 test_getcwidth_SOURCES = test/getcwidth.c
 
 test_getcwidth_SOURCES = test/getcwidth.c

-test_getcwidth_LDADD =
+test_getcwidth_LDADD = $(POSTLINK)

 
 

-etc_gen_ctype_checked_SOURCES = etc/gen-ctype-checked.c
-etc_gen_ctype_checked_LDADD =
+test_runpty_SOURCES = test/runpty.c
+test_runpty_LDADD = $(POSTLINK)

 
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
 
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##

-config/version.c: Makefile
-       sh $(srcdir)/config/version.sh $(VERSION) > $@
-
-sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
-       $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@

 
 

-sbr/ctype-checked.h: etc/gen-ctype-checked
-       etc/gen-ctype-checked
+## Hard-code the config/version.c target, instead of using $@, so this
+## rule works for the distcheck target with Solaris (System V) make.
+## distcheck uses VPATH, causes that make to prepend the VPATH to $@.
+config/version.c: Makefile $(srcdir)/config/version.sh
+       env srcdir="$(srcdir)" sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c

 
 

-sbr/ctype-checked.c: etc/gen-ctype-checked sbr/ctype-checked.h
+etc/bash_completion_nmh: $(srcdir)/etc/bash_completion_nmh-gen
+       $(srcdir)/etc/bash_completion_nmh-gen > $@

 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
        @rm -f $@
        $(SED) -e 's,%mts%,$(MTS),' \
               -e 's,%mailspool%,$(mailspool),' \
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
        @rm -f $@
        $(SED) -e 's,%mts%,$(MTS),' \
               -e 's,%mailspool%,$(mailspool),' \

-              -e 's,%smtpservers%,$(smtpservers),' \
+              -e 's,%smtpserver%,$(smtpserver),' \

               -e 's,%default_locking%,$(default_locking),' \
               -e 's,%supported_locks%,$(supported_locks),' \
                                < $(srcdir)/etc/mts.conf.in > $@
               -e 's,%default_locking%,$(default_locking),' \
               -e 's,%supported_locks%,$(supported_locks),' \
                                < $(srcdir)/etc/mts.conf.in > $@


@@ -504,49 +943,147 @@ uninstall-hook:
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
 ##
 ##
 ## Our rules to build our internal libraries (libmh.a, libmts.a)
 ##

-sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
-                     sbr/base64.c \
-                     sbr/brkstring.c sbr/check_charset.c sbr/client.c \
-                     sbr/closefds.c sbr/concat.c sbr/context_del.c \
-                     sbr/context_find.c sbr/context_foil.c sbr/context_read.c \
-                     sbr/context_replace.c sbr/context_save.c \
-                     sbr/copy.c sbr/copyip.c sbr/cpydata.c \
-                     sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \
-                     sbr/done.c sbr/dtimep.l sbr/dtime.c \
-                     sbr/escape_addresses.c \
-                     sbr/error.c sbr/ext_hook.c sbr/fdcompare.c \
-                     sbr/folder_addmsg.c sbr/folder_delmsgs.c \
-                     sbr/folder_free.c sbr/folder_pack.c \
-                     sbr/folder_read.c sbr/folder_realloc.c sbr/gans.c \
-                     sbr/getans.c sbr/getanswer.c sbr/getarguments.c \
-                     sbr/getcpy.c sbr/geteditor.c sbr/getfolder.c \
-                     sbr/getpass.c \
-                     sbr/fmt_addr.c sbr/fmt_compile.c sbr/fmt_new.c \
-                     sbr/fmt_rfc2047.c sbr/fmt_scan.c sbr/lock_file.c \
-                     sbr/m_atoi.c sbr/m_backup.c sbr/m_convert.c \
-                     sbr/m_draft.c sbr/m_getfld.c sbr/m_gmprot.c \
-                     sbr/m_maildir.c sbr/m_name.c sbr/m_rand.c \
-                     sbr/makedir.c sbr/message_id.c sbr/mts.c \
-                     sbr/norm_charmap.c sbr/path.c \
-                     sbr/peekc.c sbr/pidwait.c sbr/pidstatus.c \
-                     sbr/print_help.c sbr/print_sw.c sbr/print_version.c \
-                     sbr/push.c sbr/putenv.c sbr/refile.c sbr/remdir.c \
-                     sbr/r1bindex.c sbr/readconfig.c sbr/ruserpass.c \
-                     sbr/seq_add.c sbr/seq_bits.c sbr/seq_del.c \
-                     sbr/seq_getnum.c sbr/seq_list.c sbr/seq_nameok.c \
-                     sbr/seq_print.c sbr/seq_read.c sbr/seq_save.c \
-                     sbr/seq_setcur.c sbr/seq_setprev.c sbr/seq_setunseen.c \
-                     sbr/showfile.c sbr/signals.c sbr/smatch.c \
-                     sbr/snprintb.c sbr/ssequal.c sbr/strcasecmp.c \
-                     sbr/strindex.c sbr/trimcpy.c sbr/uprf.c sbr/vfgets.c \
-                     sbr/fmt_def.c sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
-                     sbr/m_mktemp.c sbr/getansreadline.c config/config.c \
-                     config/version.c
-
-sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
+sbr_libmh_a_SOURCES = \
+    config/config.c \
+    config/version.c \
+    sbr/addrsbr.c \
+    sbr/ambigsw.c \
+    sbr/arglist.c \
+    sbr/atooi.c \
+    sbr/base64.c \
+    sbr/brkstring.c \
+    sbr/charstring.c \
+    sbr/check_charset.c \
+    sbr/client.c \
+    sbr/closefds.c \
+    sbr/concat.c \
+    sbr/context_del.c \
+    sbr/context_find.c \
+    sbr/context_foil.c \
+    sbr/context_read.c \
+    sbr/context_replace.c \
+    sbr/context_save.c \
+    sbr/copyip.c \
+    sbr/cpydata.c \
+    sbr/cpydgst.c \
+    sbr/crawl_folders.c \
+    sbr/credentials.c \
+    sbr/ctype-checked.c \
+    sbr/datetime.c \
+    sbr/discard.c \
+    sbr/done.c \
+    sbr/dtime.c \
+    sbr/dtimep.l \
+    sbr/encode_rfc2047.c \
+    sbr/error.c \
+    sbr/escape_addresses.c \
+    sbr/ext_hook.c \
+    sbr/fdcompare.c \
+    sbr/fmt_addr.c \
+    sbr/fmt_compile.c \
+    sbr/fmt_new.c \
+    sbr/fmt_rfc2047.c \
+    sbr/fmt_scan.c \
+    sbr/folder_addmsg.c \
+    sbr/folder_delmsgs.c \
+    sbr/folder_free.c \
+    sbr/folder_pack.c \
+    sbr/folder_read.c \
+    sbr/folder_realloc.c \
+    sbr/getarguments.c \
+    sbr/getcpy.c \
+    sbr/geteditor.c \
+    sbr/getfolder.c \
+    sbr/getpass.c \
+    sbr/icalendar.l \
+    sbr/icalparse.y \
+    sbr/lock_file.c \
+    sbr/m_atoi.c \
+    sbr/m_backup.c \
+    sbr/m_convert.c \
+    sbr/m_draft.c \
+    sbr/m_getfld.c \
+    sbr/m_gmprot.c \
+    sbr/m_maildir.c \
+    sbr/m_mktemp.c \
+    sbr/m_name.c \
+    sbr/m_popen.c \
+    sbr/m_rand.c \
+    sbr/makedir.c \
+    sbr/md5.c \
+    sbr/message_id.c \
+    sbr/mf.c \
+    sbr/mime_type.c \
+    sbr/mts.c \
+    sbr/netsec.c \
+    sbr/oauth.c \
+    sbr/oauth_prof.c \
+    sbr/path.c \
+    sbr/pidstatus.c \
+    sbr/pidwait.c \
+    sbr/print_help.c \
+    sbr/print_sw.c \
+    sbr/print_version.c \
+    sbr/push.c \
+    sbr/r1bindex.c \
+    sbr/read_line.c \
+    sbr/read_switch.c \
+    sbr/read_switch_multiword.c \
+    sbr/read_switch_multiword_via_readline.c \
+    sbr/read_yes_or_no_if_tty.c \
+    sbr/readconfig.c \
+    sbr/refile.c \
+    sbr/remdir.c \
+    sbr/ruserpass.c \
+    sbr/seq_add.c \
+    sbr/seq_bits.c \
+    sbr/seq_del.c \
+    sbr/seq_getnum.c \
+    sbr/seq_list.c \
+    sbr/seq_nameok.c \
+    sbr/seq_print.c \
+    sbr/seq_read.c \
+    sbr/seq_save.c \
+    sbr/seq_setcur.c \
+    sbr/seq_setprev.c \
+    sbr/seq_setunseen.c \
+    sbr/showfile.c \
+    sbr/signals.c \
+    sbr/smatch.c \
+    sbr/snprintb.c \
+    sbr/ssequal.c \
+    sbr/strindex.c \
+    sbr/terminal.c \
+    sbr/trimcpy.c \
+    sbr/unquote.c \
+    sbr/uprf.c \
+    sbr/utils.c \
+    sbr/vector.c \
+    sbr/vfgets.c \
+    thirdparty/jsmn/jsmn.c \
+    #
+
+sbr_libmh_a_LIBADD = $(LIBOBJS)
+
+##
+## Need explicit dependency so that YACC is run before LEX.
+##
+sbr/icalendar.c: sbr/icalparse.c
+
+##
+## Because these files use the definitions in the libmh rule below,
+## they need to be rebuilt if the Makefile changes.
+##
+
+config/sbr_libmh_a-config.$(OBJEXT) sbr/sbr_libmh_a-mts.$(OBJEXT): Makefile
+
+sbr_libmh_a_CPPFLAGS = ${AM_CPPFLAGS} -I./sbr \
+               -DNMHBINDIR='"$(bindir)"' \
+               -DNMHLIBEXECDIR='"$(nmhlibexecdir)"' \
+               -DNMHETCDIR='"@nmhetcdirinst@$(nmhetcdir)"' \
+               -DNMHDOCDIR='"@docdir@"' \

                -DMAILSPOOL='"$(mailspool)"' \
                -DMAILSPOOL='"$(mailspool)"' \

-               -DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
-               -DNMHLIBDIR='"$(libdir)"'
+               -DSENDMAILPATH='"$(sendmailpath)"'

 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 
 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
 


@@ -564,9 +1101,10 @@ $(man_MANS): man/man.sed
 man/man.sed: Makefile
        @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
        @echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
 man/man.sed: Makefile
        @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
        @echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@

+       @echo 's,%nmhetcdir%,$(nmhetcdir),g' >> $@
+       @echo 's,%nmhlibexecdir%,$(nmhlibexecdir),g' >> $@

        @echo 's,%bindir%,$(bindir),g' >> $@
        @echo 's,%bindir%,$(bindir),g' >> $@

-       @echo 's,%etcdir%,$(sysconfdir),g' >> $@
-       @echo 's,%libdir%,$(libdir),g' >> $@
+       @echo 's,%docdir%,$(docdir),g' >> $@

        @echo 's,%mandir%,$(mandir),g' >> $@
        @echo 's,%mailspool%,$(mailspool),g' >> $@
        @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
        @echo 's,%mandir%,$(mandir),g' >> $@
        @echo 's,%mailspool%,$(mailspool),g' >> $@
        @echo 's,%sendmailpath%,$(sendmailpath),g' >> $@


@@ -618,7 +1156,7 @@ ChangeLog:
 ## Our RPM build target
 ##
 rpm: dist
 ## Our RPM build target
 ##
 rpm: dist

-       @test -d $(rpmdir)/SOURCES || $(MKDIR_P) $(rpmdir)/SOURCES
+       @$(MKDIR_P) $(rpmdir)/SOURCES

        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \
        @mv -f $(DIST_ARCHIVES) $(rpmdir)/SOURCES
        @cp -p VERSION $(rpmdir)/SOURCES
        @rpmbuild --define '_topdir $(rpmdir)' \


@@ -633,16 +1171,17 @@ rpm: dist
 ## These targets are not integrated into the other automake
 ## targets because they will be used so infrequently, if at all.
 ##
 ## These targets are not integrated into the other automake
 ## targets because they will be used so infrequently, if at all.
 ##

-gcov:
-       @if ./config.status --config | grep -e --enable-debug >/dev/null; then \
-          echo For best results with gcov, configure without --enable-debug; \
-        fi
+gcov: gcov-rebuild gcov-run gcov-process gcov-report
+gcov-rebuild:

        @echo rebuilding with AM_CFLAGS=--coverage . . .
        @echo rebuilding with AM_CFLAGS=--coverage . . .

-       @(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null  && \
-         make check AM_CFLAGS=--coverage
+       @(make clean  &&  make AM_CFLAGS=--coverage) > /dev/null
+gcov-run:
+       make check AM_CFLAGS=--coverage
+gcov-process:

        @for i in `find . -name '*.gcda'`; do \
        @for i in `find . -name '*.gcda'`; do \

-          gcov -p -o `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \
+          gcov -pro `echo $$i | $(SED) 's%\\(.*\\)/%\\1 %'`; \

         done
         done

+gcov-report:

        @for i in `find . -name '*.gcno'`; do \
           if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \
             echo untested: $$i; \
        @for i in `find . -name '*.gcno'`; do \
           if test -f `echo $$i | sed 's%\.gcno%.gcda%'`; then :; else \
             echo untested: $$i; \


@@ -652,7 +1191,8 @@ gcov-mostlyclean:
        @find . -name '*.gcno' -o -name '*.gcda' | xargs rm
 gcov-clean: gcov-mostlyclean
        @find . -name '*.gcov' | xargs rm
        @find . -name '*.gcno' -o -name '*.gcda' | xargs rm
 gcov-clean: gcov-mostlyclean
        @find . -name '*.gcov' | xargs rm

-.PHONY: gcov gcov-mostlyclean gcov-clean
+.PHONY: gcov gcov-rebuild gcov-run gcov-process gcov-report \
+    gcov-mostlyclean gcov-clean

 
 
 ##
 
 
 ##