X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/63764e68d4fce20854dc2ba18a7244cb6a6769ca..5f7741bd825fcacdec9e6dae01d0d79123455df3:/Makefile.am?ds=inline

diff --git a/Makefile.am b/Makefile.am
index cb876894..1e64f159 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 \
@@ -305,7 +308,7 @@ 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) $(TERMLIB)
+uip_mhfixmsg_LDADD = $(LDADD) $(ICONVLIB) $(TERMLIB)
 
 uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
 		     uip/mhlistsbr.c uip/mhmisc.c uip/mhfree.c uip/termsbr.c \
@@ -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)
@@ -545,6 +550,13 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      sbr/m_mktemp.c sbr/getansreadline.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)"' \
 		-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
@@ -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' >> $@