X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=2c4dcfe036090c7fed250f5224346a264cd4e9e6;hb=d0aa081697fcdc51fc24fa268f13a8d130366b36;hp=bacc263cfeb91105a07de72ef990080d1b821a94;hpb=f51d08573e0b5ee447c03bd83547ed252103354c;p=mmh

diff --git a/Makefile.am b/Makefile.am
index bacc263..2c4dcfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,9 @@ auxexecdir = @libdir@
 TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
 		    MH_TEST_DIR=@abs_builddir@/test/testdir \
 		    auxexecdir=$(auxexecdir) bindir=$(bindir) \
-		    mandir=$(mandir) sysconfdir=$(sysconfdir)
+		    mandir=$(mandir) sysconfdir=$(sysconfdir) \
+		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
+		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
 ##
 ## Important note: the "cleanup" test should always be last
 ##
@@ -65,7 +67,7 @@ TESTS = test/bad-input/test-header \
 	test/refile/test-refile \
 	test/repl/test-if-str test/repl/test-trailing-newline \
 	test/repl/test-multicomp \
-	test/scan/test-scan \
+	test/scan/test-scan test/scan/test-scan-multibyte \
 	test/sequences/test-flist test/sequences/test-mark \
 	test/whatnow/test-attach-detach test/whatnow/test-cd \
 	test/whatnow/test-ls test/whom/test-whom \
@@ -81,7 +83,7 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
 	     etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
 clean-local:
-	@rm -rf RPM a.out.DSYM uip/a.out.DSYM
+	@rm -rf RPM a.out.dSYM uip/a.out.dSYM
 	@rm -rf test/testdir
 
 ##
@@ -201,7 +203,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 ## Automake using the automatic rules
 ##
 EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
-	     etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE \
+	     etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE MACHINES \
 	     docs/ChangeLog_MH-3_to_MH-6.6 \
 	     docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
 	     man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
@@ -477,7 +479,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.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/dtime.c sbr/escape_display_name.c \
+		      sbr/done.c 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 \
 		      sbr/folder_free.c sbr/folder_pack.c \