X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7ebe4fe7bb8bf17b4e1058f687efbe9535d11df7..4bf2f9df237a4ff9cf449abaae0e444d74981dfa:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 974d9ee2..29e3be90 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)" \
 		    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
@@ -52,6 +53,7 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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 \
@@ -61,8 +63,8 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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/mhstore/test-mhstore \
-	test/new/test-basic \
+	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 \
@@ -76,13 +78,15 @@ TESTS = test/ali/test-ali test/anno/test-anno \
 	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.
 
 check_SCRIPTS = test/common.sh
-check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp
+check_PROGRAMS = test/getfullname test/getfqdn test/fakepop test/fakesmtp \
+		 test/getcwidth
 DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
@@ -471,7 +475,8 @@ uninstall-hook:
 ##
 ## 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/base64.c \
+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 \
@@ -484,7 +489,8 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.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/getfolder.c sbr/getpass.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 \
@@ -503,20 +509,17 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/base64.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/m_msgdef.c sbr/mf.c sbr/utils.c \
+		      sbr/fmt_def.c sbr/mf.c sbr/utils.c \
 		      sbr/m_mktemp.c sbr/getansreadline.c config/config.c \
 		      config/version.c
 
 sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DMAILSPOOL='"$(mailspool)"' \
 		-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
-		-DNMHLIBDIR='"$(libdir)"' \
-		-DDEFAULT_EDITOR='"$(editorpath)"' \
-		-DDEFAULT_PAGER='"$(pagerpath)"'
+		-DNMHLIBDIR='"$(libdir)"'
 
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) \
-			 $(DISABLE_UNUSED_MACROS_WARNING) \
 			 $(DISABLE_SIGN_COMPARE_WARNING)
 
 mts_libmts_a_SOURCES = mts/smtp/smtp.c
@@ -541,8 +544,6 @@ man/man.sed: Makefile
 	@echo 's,%mandir%,$(mandir),g' >> $@
 	@echo 's,%mailspool%,$(mailspool),g' >> $@
 	@echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-	@echo 's,%default_editor%,$(editorpath),g' >> $@
-	@echo 's,%default_pager%,$(pagerpath),g' >> $@
 	@echo 's,%manext1%,$(manext1),g' >> $@
 	@echo 's,%manext5%,$(manext5),g' >> $@
 	@echo 's,%manext7%,$(manext7),g' >> $@