X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ed0511acb39dda9a816e11c771b65374fd4c0f76..c04ae4d5be21d4c9dff1483663873ec364e03e0d:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8307f960..78cce559 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,7 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
 		    MH_TEST_DIR="@abs_builddir@/test/testdir" \
 		    auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
 		    mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
+		    supported_locks="$(supported_locks)" \
 		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 		    ICONV_ENABLED=$(ICONV_ENABLED) \
 		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
@@ -58,7 +59,9 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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/manpages/test-manpages \
+	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/mhfixmsg/test-mhfixmsg \
 	test/mhlist/test-mhlist test/mhmail/test-mhmail \
@@ -202,7 +205,7 @@ dist_doc_DATA = COPYRIGHT INSTALL NEWS README VERSION \
 ##
 contribdir = $(docdir)/contrib
 dist_contrib_DATA = docs/contrib/replyfilter docs/contrib/build_nmh \
-		    docs/contrib/ml
+		    docs/contrib/ml docs/contrib/vpick
 
 ##
 ## Our man pages
@@ -455,6 +458,8 @@ etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
 	$(SED) -e 's,%mts%,$(MTS),' \
 	       -e 's,%mailspool%,$(mailspool),' \
 	       -e 's,%smtpservers%,$(smtpservers),' \
+	       -e 's,%default_locking%,$(default_locking),' \
+	       -e 's,%supported_locks%,$(supported_locks),' \
 				< $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
@@ -513,8 +518,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/cpydgst.c sbr/crawl_folders.c sbr/credentials.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 \
@@ -539,11 +544,18 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.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/snprintb.c sbr/ssequal.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/m_mktemp.c sbr/getansreadline.c sbr/vector.c \
+		      config/config.c config/version.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 = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DMAILSPOOL='"$(mailspool)"' \
@@ -572,6 +584,8 @@ man/man.sed: Makefile
 	@echo 's,%mandir%,$(mandir),g' >> $@
 	@echo 's,%mailspool%,$(mailspool),g' >> $@
 	@echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
+	@echo 's,%default_locking%,$(default_locking),g' >> $@
+	@echo 's,%supported_locks%,$(supported_locks),g' >> $@
 	@echo 's,%manext1%,$(manext1),g' >> $@
 	@echo 's,%manext5%,$(manext5),g' >> $@
 	@echo 's,%manext7%,$(manext7),g' >> $@