X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ef02b5cfad61304c9745f112a9a5b76f12b6c1ed..9f8418e870a70c264eda1598f2d470e5428c216d:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 33c7e2ca..beff7db6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,7 @@ 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/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 \
@@ -100,6 +100,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/rcv/test-rcvtty test/refile/test-refile test/repl/test-convert \
 	test/repl/test-if-str test/repl/test-trailing-newline \
 	test/repl/test-multicomp test/repl/test-repl \
+	test/scan/test-header-parsing \
 	test/scan/test-scan test/scan/test-scan-multibyte \
 	test/sequences/test-flist test/sequences/test-mark \
 	test/sequences/test-out-of-range \
@@ -110,6 +111,10 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	test/whatnow/test-ls test/whom/test-whom \
 	test/cleanup ## The "cleanup" test should always be last.
 
+XFAIL_TESTS = \
+    test/scan/test-header-parsing \
+    #
+
 check_SCRIPTS = test/common.sh
 check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
 		 test/getcwidth test/fakehttp
@@ -504,7 +509,7 @@ 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 = $(POSTLINK)
+test_fakehttp_LDADD = $(LDADD) $(POSTLINK)
 
 test_getcwidth_SOURCES = test/getcwidth.c
 test_getcwidth_LDADD = $(POSTLINK)
@@ -632,6 +637,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/arglist.c \
 		      config/config.c config/version.c \
 		      thirdparty/jsmn/jsmn.c
 
+sbr_libmh_a_LIBADD = $(LIBOBJS)
+
 ##
 ## Because these files use the definitions in the libmh rule below,
 ## they need to be rebuilt if the Makefile changes.