X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b24a1b1ac51ca3bbacc82700dd1388b7dae2633d..75960fa3577b190e8d64a889f68f9480a372ae4b:/Makefile.am?ds=inline

diff --git a/Makefile.am b/Makefile.am
index 13b6d448..a73a4215 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
 		    auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
 		    mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
 		    supported_locks="$(supported_locks)" \
+		    default_locking="${default_locking}" \
 		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 		    ICONV_ENABLED=$(ICONV_ENABLED) \
 		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
@@ -51,9 +52,11 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/folder/test-create test/folder/test-packf \
 	test/folder/test-recurse test/folder/test-sortm \
 	test/folder/test-total \
+	test/format/test-curses \
 	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-nullstr \
 	test/format/test-rightjustify \
 	test/format/test-unquote \
 	test/forw/test-forw-digest test/forw/test-forw-format \
@@ -63,16 +66,20 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/install-mh/test-install-mh \
 	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-utf8-body \
 	test/mhfixmsg/test-mhfixmsg \
-	test/mhlist/test-mhlist test/mhmail/test-mhmail \
+	test/mhlist/test-mhlist test/mhlist/test-ext-params \
+	test/mhmail/test-mhmail \
 	test/mhparam/test-mhparam test/mhpath/test-mhpath \
-	test/mhshow/test-charset \
+	test/mhshow/test-charset test/mhshow/test-textcharset \
 	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/mhstore/test-mhstore test/mkstemp/test-mkstemp \
+	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 \
@@ -92,14 +99,15 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/cleanup ## The "cleanup" test should always be last.
 
 check_SCRIPTS = test/common.sh
-check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp \
+check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
 		 test/getcwidth
 DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
 ## Stuff that should be cleaned via "make clean"
+## automake 1.12.6 on FreeBSD 9 needs the sbr/dtimep.c.
 ##
-CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf \
+CLEANFILES = config/version.c sbr/sigmsg.h sbr/dtimep.c 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)
 clean-local:
@@ -144,9 +152,9 @@ 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_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/mkstemp \
+		   uip/post uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty \
+		   uip/slocal uip/viamail uip/mhtest
 
 auxexec_SCRIPTS = uip/spost
 
@@ -182,7 +190,8 @@ dist_sysconf_DATA = etc/MailAliases etc/components etc/digestcomps \
 		    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.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
 
@@ -221,8 +230,8 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 	   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/mhfixmsg.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/mhpath.1 man/mhshow.1 man/mhstore.1 man/mkstemp.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 \
@@ -242,8 +251,8 @@ man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
 	   man/mh_profile.man man/mh-sequence.man man/mh-tailor.man \
 	   man/mhbuild.man man/mhfixmsg.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/mhshow.man man/mhstore.man man/mkstemp.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 \
@@ -262,7 +271,8 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
 	     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 \
+	     test/mhbuild/tiny.jpg \
+	     test/post/test-post-common.sh test/valgrind.supp uip/mhmail \
 	     SPECS/nmh.spec SPECS/build-nmh-cygwin $(man_SRCS)
 
 ##
@@ -271,182 +281,211 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in \
 ## 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_LDADD = $(LDADD) $(POSTLINK)
 
 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/mhcachesbr.c uip/md5.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_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_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_dist_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_flist_SOURCES = uip/flist.c
+uip_flist_LDADD = $(LDADD) $(POSTLINK)
 
 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_LDADD = $(LDADD) $(ICONVLIB) $(READLINELIB)
+uip_forw_LDADD = $(LDADD) $(READLINELIB) $(TERMLIB) $(ICONVLIB) $(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) $(POSTLINK)
 
 uip_install_mh_SOURCES = uip/install-mh.c
+uip_install_mh_LDADD = $(LDADD) $(POSTLINK)
 
 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/mhfree.c uip/mhparse.c uip/termsbr.c uip/md5.c
-uip_mhbuild_LDADD = $(LDADD) $(TERMLIB)
+		      uip/mhfree.c uip/mhparse.c uip/md5.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/termsbr.c uip/md5.c
-uip_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB)
+		       uip/mhshowsbr.c uip/mhlistsbr.c uip/md5.c
+uip_mhfixmsg_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 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/md5.c
+uip_mhlist_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 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/md5.c
+uip_mhn_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_mhparam_SOURCES = uip/mhparam.c
+uip_mhparam_LDADD = $(LDADD) $(POSTLINK)
 
 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/mhfree.c uip/termsbr.c uip/md5.c
-uip_mhshow_LDADD = $(LDADD) $(TERMLIB)
+		     uip/mhfree.c uip/md5.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/mhmisc.c uip/mhfree.c uip/termsbr.c uip/md5.c
-uip_mhstore_LDADD = $(LDADD) $(TERMLIB)
+		      uip/mhmisc.c uip/mhfree.c uip/md5.c
+uip_mhstore_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_msgchk_SOURCES = uip/msgchk.c uip/popsbr.c
-uip_msgchk_LDADD = $(LDADD) $(SASLLIB)
+uip_msgchk_LDADD = $(LDADD) $(SASLLIB) $(POSTLINK)
 
 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/scansbr.c uip/dropsbr.c uip/mhlsbr.c
+uip_msh_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_new_SOURCES = uip/new.c
+uip_new_LDADD = $(LDADD) $(POSTLINK)
 
 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_LDADD = $(LDADD) $(ICONVLIB)
+uip_pick_LDADD = $(LDADD) $(ICONVLIB) $(POSTLINK)
 
 uip_prompter_SOURCES = uip/prompter.c
+uip_prompter_LDADD = $(LDADD) $(POSTLINK)
 
 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_LDADD = $(LDADD) $(POSTLINK)
 
 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) $(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_LDADD = $(LDADD) $(POSTLINK)
 
 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) $(POSTLINK)
 
 uip_whom_SOURCES = uip/whom.c uip/distsbr.c
+uip_whom_LDADD = $(LDADD) $(POSTLINK)
 
 ##
 ## Programs definitions for all utilities that end up in $(libdir)
 ##
 
-uip_ap_SOURCES = uip/ap.c uip/termsbr.c
-uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
+uip_ap_SOURCES = uip/ap.c
+uip_ap_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
 
 uip_conflict_SOURCES = uip/conflict.c uip/aliasbr.c
+uip_conflict_LDADD = $(LDADD) $(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_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/md5.c
+uip_mhtest_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) $(POSTLINK)
+
+uip_mkstemp_SOURCES = uip/mkstemp.c
+uip_mkstemp_LDADD = $(LDADD) $(POSTLINK)
 
 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) $(TLSLIB) $(POSTLINK)
 
 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_LDADD = $(LDADD) $(POSTLINK)
 
 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_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_viamail_LDADD = $(LDADD) $(POSTLINK)
 
 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_LDADD = $(POSTLINK)
 
 test_fakesmtp_SOURCES = test/fakesmtp.c
-test_fakesmtp_LDADD =
+test_fakesmtp_LDADD = $(POSTLINK)
 
 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 =
+etc_gen_ctype_checked_LDADD = $(POSTLINK)
 
 ##
 ## Our rebuild rules for files that aren't built via the normal mechanisms
 ##
+
+## 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
-	sh $(srcdir)/config/version.sh $(VERSION) > $@
+	sh $(srcdir)/config/version.sh $(VERSION) > ./config/version.c
 
 sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
 	$(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
@@ -537,7 +576,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/makedir.c sbr/message_id.c sbr/mime_type.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 \
@@ -549,7 +588,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/trimcpy.c sbr/unquote.c \
+		      sbr/strindex.c sbr/terminal.c \
+		      sbr/trimcpy.c sbr/unquote.c \
 		      sbr/uprf.c sbr/vfgets.c \
 		      sbr/mf.c sbr/utils.c sbr/ctype-checked.c \
 		      sbr/m_mktemp.c sbr/getansreadline.c sbr/vector.c \