10 files changed, 60 insertions, 37 deletions
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 128afb9bc..a4a94ba9d 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -113,12 +113,13 @@ pkginclude_HEADERS = \
  syslog.h\
  sql.h\
  tls.h\
- types.h\
  url.h\
  version.h\
  wordsplit.h\
  yyloc.h
 
+nodist_pkginclude_HEADERS = types.h
+
 if MU_COND_SUPPORT_CXX
   CPP_DIR = cpp
 endif
diff --git a/maint/fullcheck.mk b/maint/fullcheck.mk
index c636380f4..13b6d795c 100644
--- a/maint/fullcheck.mk
+++ b/maint/fullcheck.mk
@@ -32,11 +32,12 @@ define fullcheck_tmpl
 check-$(fmt): fullcheck_dist fullcheckdir-$(fmt)
 	cd $(FULLCHECKDIR)/$(fmt) && \
 	tar xf ../../$(DISTNAME).tar.gz && \
-	cd $(DISTNAME) && \
-	mkdir .build && \
-	cd .build && \
-	../configure MU_DEFAULT_SCHEME=$(fmt) && \
+	chmod -R a-w $(DISTNAME) && \
+	mkdir _build && \
+	cd _build && \
+	../$(DISTNAME)/configure MU_DEFAULT_SCHEME=$(fmt) && \
 	make check
+	chmod -R u+w $(FULLCHECKDIR)/$(fmt)
 	rm -rf $(FULLCHECKDIR)/$(fmt) 
 endef
 
diff --git a/mda/Makefile.am b/mda/Makefile.am
index 9191641bc..b32aa686e 100644
--- a/mda/Makefile.am
+++ b/mda/Makefile.am
@@ -25,4 +25,4 @@ if MU_COND_PUTMAIL
   SUBDIRS += putmail
 endif
 
-EXTRA_DIST = tests/input.msg tests/mda.inc
+EXTRA_DIST = tests/input.msg tests/mda.inc tests/mda.sh
diff --git a/mda/lmtpd/tests/atlocal.in b/mda/lmtpd/tests/atlocal.in
index 9c4bfa4de..cd33fd1ff 100644
--- a/mda/lmtpd/tests/atlocal.in
+++ b/mda/lmtpd/tests/atlocal.in
@@ -3,4 +3,5 @@
 # Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@/..:$PATH
-INPUT_MSG=$abs_top_srcdir/mda/tests/input.msg
+MU_DEFAULT_SCHEME=@MU_DEFAULT_SCHEME@
+. $abs_top_srcdir/mda/tests/mda.sh
diff --git a/mda/lmtpd/tests/lmtpd.at b/mda/lmtpd/tests/lmtpd.at
index ab892a18a..f2732e232 100644
--- a/mda/lmtpd/tests/lmtpd.at
+++ b/mda/lmtpd/tests/lmtpd.at
@@ -30,16 +30,14 @@ AT_DATA([session_end],[.
 QUIT
 ])
 
-echo ENVELOPE > expout
-cat $INPUT_MSG >> expout
-echo "" >> expout
+cat $INPUT_MSG > expout
 
 cat session_start $INPUT_MSG session_end | tocrlf > session || exit $?
 
 mkdir spool
 lmtpd MDA_OPTIONS --stderr --set 'group=()' < session > transcript || exit $?
 
-sed '1s/From gulliver@example.net.*/ENVELOPE/' spool/root
+dumpmail spool/root
 cat transcript | tr -d '\r' | sed '/...-/d;s/ .*//' >&2
 ],
 [0],
diff --git a/mda/mda/tests/atlocal.in b/mda/mda/tests/atlocal.in
index 9c4bfa4de..cd33fd1ff 100644
--- a/mda/mda/tests/atlocal.in
+++ b/mda/mda/tests/atlocal.in
@@ -3,4 +3,5 @@
 # Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@/..:$PATH
-INPUT_MSG=$abs_top_srcdir/mda/tests/input.msg
+MU_DEFAULT_SCHEME=@MU_DEFAULT_SCHEME@
+. $abs_top_srcdir/mda/tests/mda.sh
diff --git a/mda/putmail/tests/atlocal.in b/mda/putmail/tests/atlocal.in
index 9c4bfa4de..cd33fd1ff 100644
--- a/mda/putmail/tests/atlocal.in
+++ b/mda/putmail/tests/atlocal.in
@@ -3,4 +3,5 @@
 # Copyright (C) 2004-2019 Free Software Foundation, Inc.
 
 PATH=@abs_builddir@/..:$PATH
-INPUT_MSG=$abs_top_srcdir/mda/tests/input.msg
+MU_DEFAULT_SCHEME=@MU_DEFAULT_SCHEME@
+. $abs_top_srcdir/mda/tests/mda.sh
diff --git a/mda/tests/mda.inc b/mda/tests/mda.inc
index 9591e4f56..ed60578c3 100644
--- a/mda/tests/mda.inc
+++ b/mda/tests/mda.inc
@@ -1,30 +1,7 @@
 m4_include([testsuite.inc])
 
 m4_define([MDA_OPTIONS],[dnl
-MUT_DEFAULT_OPTIONS dnl
 --set '|mailbox|mailbox-pattern='`pwd`/spool/'${user}' dnl
 --set .auth.authorization=system])
-
-m4_define([dumpmail],
-[m4_case(MU_DEFAULT_SCHEME,
-[mbox],
-[sed -e '/^From /d' -e '$d' $1],
-[dotmail],
-[sed -e '/^\.$/d' $1],
-[mh],
-[sed -e /^X-IMAPbase:/d\
-     -e /^X-UID:/d\
-     -e /^X-Envelope-Sender:/d\
-     -e /^X-Envelope-Date:/d $1/1],
-[maildir],
-[f=$(find $1/new -type f | head -n 1)
- if test -n $f; then
-    sed -e /^X-IMAPbase:/d\
-        -e /^X-UID:/d\
-        -e /^X-Envelope-Sender:/d\
-        -e /^X-Envelope-Date:/d $f
- fi],
-[# Should not happen
- m4_fatal([Unknown default mailbox format (MU_DEFAULT_SCHEME)])])])
     
 
diff --git a/mda/tests/mda.sh b/mda/tests/mda.sh
new file mode 100644
index 000000000..347c3bf5c
--- /dev/null
+++ b/mda/tests/mda.sh
@@ -0,0 +1,44 @@
+# This file is part of GNU Mailutils.
+# Copyright (C) 2007-2019 Free Software Foundation, Inc.
+#
+# GNU Mailutils is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or (at
+# your option) any later version.
+#
+# GNU Mailutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+INPUT_MSG=$abs_top_srcdir/mda/tests/input.msg
+dumpmail() {
+    case $MU_DEFAULT_SCHEME in
+	mbox)
+	    sed -e '/^From /d' -e '$d' $1
+	    ;;
+	dotmail)
+	    sed -e '/^\.$/d' $1
+	    ;;
+	mh)
+	    sed -e /^X-IMAPbase:/d\
+                -e /^X-UID:/d\
+                -e /^X-Envelope-Sender:/d\
+                -e /^X-Envelope-Date:/d $1/1
+	    ;;
+	maildir)
+	    f=$(find $1/new -type f | head -n 1)
+	    if test -n $f; then
+		sed -e /^X-IMAPbase:/d\
+                    -e /^X-UID:/d\
+                    -e /^X-Envelope-Sender:/d\
+                    -e /^X-Envelope-Date:/d $f
+	    fi
+	    ;;
+	*)  # Should not happen
+	    echo >&2 "Default mailbox format is uknown"
+    esac
+}    
diff --git a/testsuite/package.m4.in b/testsuite/package.m4.in
index e9b7de5e9..a9bd74a90 100644
--- a/testsuite/package.m4.in
+++ b/testsuite/package.m4.in
@@ -4,4 +4,3 @@ m4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])
 m4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])
 m4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])
 m4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])
-m4_define([MU_DEFAULT_SCHEME],    [@MU_DEFAULT_SCHEME@])