Reorganize testsuite

Simplify Makefile.am's in tests subdirectories by moving the common part
in a separate file and including it where necessary. Build only one copy
of package.m4.  Both package.m4 and include file testsuite.am reside in
the testsuite directory.

Also provide configure options for selecting mda components to build:

  --disable-build-mda     do not build mda
  --disable-build-lmtpd   do not build lmtpd
  --disable-build-putmail do not build putmail

* .gitignore: Update.
* Makefile.am [MU_COND_MDA]: Change to MU_COND_MDA_TOOLS
* configure.ac: Provide a way to enable/disable building of
mda, lmtpd and putmail separately.
Build testsuite/package.m4

* testsuite/testsuite.am
* testsuite/Makefile.am: Distribute both package.m4.in and package.m4.
Include main part from testsuite.am
* testsuite/package.m4.in: New file.

* comsat/tests/Makefile.am: Include main part from testsuite.am
* frm/tests/Makefile.am: Likewise.
* imap4d/tests/Makefile.am: Likewise.
* libmailutils/tests/Makefile.am: Likewise.
* libmu_scm/tests/Makefile.am: Likewise.
* libproto/dotmail/tests/Makefile.am: Likewise.
* mail/tests/Makefile.am: Likewise.
* messages/tests/Makefile.am: Likewise.
* mh/tests/Makefile.am: Likewise.
* mimeview/tests/Makefile.am: Likewise.
* readmsg/tests/Makefile.am: Likewise.
* sieve/tests/Makefile.am: Likewise.

* mda/.gitignore: Remove.
* mda/tests/Makefile.am: Remove.
* mda/tests/testsuite.at: Remove.
* mda/tests/.gitignore: Remove.
* mda/tests/atlocal.in: Remove.
* mda/tests/mda.inc: New file.

* mda/Makefile.am: Add extra directory level.  Add subdirs
depending on whether the corresponding component is selected
for building.
* mda/lmtpd/.gitignore: New file.
* mda/lmtpd/Makefile.am: New file.
* mda/lmtpd.c: Move to mda/lmtpd/lmtpd.c

* mda/lmtpd/tests/.gitignore: New file.
* mda/lmtpd/tests/Makefile.am: New file.
* mda/lmtpd/tests/atlocal.in: New file.
* mda/tests/lmtpd.at: Move to mda/lmtpd/tests/lmtpd.at
* mda/lmtpd/tests/testsuite.at: New file.

* mda/mda/.gitignore: New file.
* mda/mda/Makefile.am: New file.
* mda/mda.c: Move to mda/mda/mda.c
* mda/mda/tests/.gitignore: New file.
* mda/mda/tests/Makefile.am: New file.
* mda/mda/tests/atlocal.in: New file.
* mda/tests/forward.at: Move to mda/mda/tests/forward.at
* mda/tests/mda.at: Move to mda/mda/tests/mda.at
* mda/mda/tests/testsuite.at: New file.

* mda/putmail/.gitignore: New file.
* mda/putmail/Makefile.am: New file.
* mda/putmail.c: Move to mda/putmail/putmail.c
* mda/putmail/tests/.gitignore: New file.
* mda/putmail/tests/Makefile.am: New file.
* mda/putmail/tests/atlocal.in: New file.
* mda/tests/putmail.at: Move to mda/putmail/tests/putmail.at
* mda/putmail/tests/testsuite.at: New file

* po/POTFILES.in: Update pathnames

* maint/fullcheck.mk: Minor fixes.

52 files changed, 467 insertions, 896 deletions

diff --git a/.gitignore b/.gitignore
index e4d9c7afc..5271624b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 *.pyo
 *.so
 *~
+*.bak
 .bootstrap
 .deps
 .emacs*
@@ -39,3 +40,5 @@ stamp-h1
 tmp/
 /patch/
 .gdbinit
+conf.*.sh
+_fullcheck
diff --git a/Makefile.am b/Makefile.am
index 716be7a72..2b4920004 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ if MU_COND_IMAP4D
   IMAP4D_DIR = imap4d
 endif
 
-if MU_COND_MDA
+if MU_COND_MDA_TOOLS
   MDA_DIR = mda
 endif
 
diff --git a/comsat/tests/Makefile.am b/comsat/tests/Makefile.am
index 57c8bd325..cc1e08b02 100644
--- a/comsat/tests/Makefile.am
+++ b/comsat/tests/Makefile.am
@@ -1,64 +1 @@
-# This file is part of GNU Mailutils.
-# Copyright (C) 2010-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/>.
-
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >$(srcdir)/package.m4
-
-#
-
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE_AT = testsuite.at
-
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE) 
-	@$(SHELL) $(TESTSUITE)
-
-# Run the test suite on the *installed* tree.
-#installcheck-local:
-#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
-
-
+include $(top_srcdir)/testsuite/testsuite.am
diff --git a/configure.ac b/configure.ac
index 175214576..f74b10e02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1326,8 +1326,12 @@ MU_ENABLE_BUILD(pop3d,,,["$mu_build_servers" = yes],,[server_list])
 MU_ENABLE_BUILD(imap4d,,,["$mu_build_servers" = yes],,[server_list])
 MU_ENABLE_BUILD(comsat,,,["$mu_build_servers" = yes],,[server_list])
 
+MU_ENABLE_BUILD(mda,[mu_build_mda_tools=yes],,["$mu_build_servers" = yes],,[server_list])
+MU_ENABLE_BUILD(lmtpd,[mu_build_mda_tools=yes],,["$mu_build_servers" = yes],,[server_list])
+MU_ENABLE_BUILD(putmail,[mu_build_mda_tools=yes],,["$mu_build_clients" = yes],,[client_list])
+AM_CONDITIONAL([MU_COND_MDA_TOOLS],[test "$mu_build_mda_tools" = yes])
+
 MU_ENABLE_BUILD(frm,,,["$mu_build_clients" = yes],,[client_list])
-MU_ENABLE_BUILD(mda,,,["$mu_build_clients" = yes],,[client_list])
 
 MU_ENABLE_BUILD(mail,,,["$mu_build_clients" = yes],,[client_list])
 AC_SUBST([MAILBINDIR],'${bindir}')
@@ -1364,9 +1368,12 @@ test -z "$client_list" && client_list=" [NONE]"
 AC_CONFIG_TESTDIR(testsuite)
 AC_CONFIG_FILES([testsuite/Makefile testsuite/atlocal])
 
+AC_CONFIG_FILES([testsuite/package.m4])
 MU_CONFIG_TESTSUITE(libmailutils)
 MU_CONFIG_TESTSUITE(frm)
-MU_CONFIG_TESTSUITE(mda)
+MU_CONFIG_TESTSUITE(mda/lmtpd)
+MU_CONFIG_TESTSUITE(mda/mda)
+MU_CONFIG_TESTSUITE(mda/putmail)
 MU_CONFIG_TESTSUITE(mail)
 MU_CONFIG_TESTSUITE(messages)
 MU_CONFIG_TESTSUITE(readmsg)
@@ -1523,6 +1530,9 @@ AC_CONFIG_FILES([
  libproto/mailer/Makefile
  mda/Makefile
  mda/lib/Makefile
+ mda/lmtpd/Makefile
+ mda/mda/Makefile
+ mda/putmail/Makefile
  mail/Makefile
  mail/testsuite/Makefile
  libmailutils/auth/Makefile
diff --git a/frm/tests/Makefile.am b/frm/tests/Makefile.am
index 72959ebbd..cc1e08b02 100644
--- a/frm/tests/Makefile.am
+++ b/frm/tests/Makefile.am
@@ -1,64 +1 @@
-# 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/>.
-
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >$(srcdir)/package.m4
-
-#
-
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE_AT = testsuite.at
-
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE) 
-	@$(SHELL) $(TESTSUITE)
-
-# Run the test suite on the *installed* tree.
-#installcheck-local:
-#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
-
-
+include $(top_srcdir)/testsuite/testsuite.am
diff --git a/imap4d/tests/Makefile.am b/imap4d/tests/Makefile.am
index 2e471c20d..50d09833c 100644
--- a/imap4d/tests/Makefile.am
+++ b/imap4d/tests/Makefile.am
@@ -14,23 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >$(srcdir)/package.m4
+include $(top_srcdir)/testsuite/testsuite.am
 
 ## -------------------------- ##
 ## Non-installable programs
@@ -40,11 +24,7 @@ AM_CPPFLAGS = @MU_LIB_COMMON_INCLUDES@
 noinst_PROGRAMS = ckiconv
 LDADD = ${MU_LIB_MAILUTILS}
 
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE_AT = \
+TESTSUITE_AT += \
  anystate.at\
  append00.at\
  append01.at\
@@ -60,28 +40,6 @@ TESTSUITE_AT = \
  list.at\
  search.at\
  select.at\
- status.at\
- testsuite.at
-
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE) 
-	@$(SHELL) $(TESTSUITE)
-
-# Run the test suite on the *installed* tree.
-#installcheck-local:
-#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
+ status.at
 
 
diff --git a/libmailutils/tests/Makefile.am b/libmailutils/tests/Makefile.am
index bc839c3d6..a933152f6 100644
--- a/libmailutils/tests/Makefile.am
+++ b/libmailutils/tests/Makefile.am
@@ -14,25 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-        } >$(srcdir)/package.m4
-
-#
+include $(top_srcdir)/testsuite/testsuite.am
+AUTOTEST_INCLUDES += -I $(top_srcdir)/libmailutils/wordsplit
 
 ## -------------------------- ##
 ## Non-installable programs
@@ -97,11 +80,7 @@ LDADD = ${MU_LIB_MAILUTILS}
 
 EXTRA_DIST += Encode Decode Wicketfile
 
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE_AT = \
+TESTSUITE_AT += \
  address.at\
  base64d.at\
  base64e.at\
@@ -188,7 +167,6 @@ TESTSUITE_AT = \
  strin.at\
  strout.at\
  strtoc.at\
- testsuite.at\
  url.at\
  url-comp.at\
  xml.at\
@@ -199,31 +177,6 @@ TESTSUITE_AT = \
  wordwrap03.at\
  xscript.at
 
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) \
-              -I $(srcdir)\
-              -I $(top_srcdir)/testsuite\
-              -I $(top_srcdir)/libmailutils/wordsplit\
-              testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE)
-	@$(SHELL) $(TESTSUITE)
-
-# Run the test suite on the *installed* tree.
-#installcheck-local:
-#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
-
 # ###########################
 # Wordsplit testsuite
 # ###########################
diff --git a/libmailutils/tests/testsuite.at b/libmailutils/tests/testsuite.at
index 05b77b116..39fdfa71e 100644
--- a/libmailutils/tests/testsuite.at
+++ b/libmailutils/tests/testsuite.at
@@ -182,6 +182,9 @@ m4_include([xscript.at])
 
 m4_include([list.at])
 m4_include([address.at])
+
+AT_BANNER(Wordsplit)
+
 m4_include([wordsplit.at])
 m4_include([exp.at])
 m4_include([url.at])
diff --git a/libmu_scm/tests/Makefile.am b/libmu_scm/tests/Makefile.am
index 26b6d4938..d429146d1 100644
--- a/libmu_scm/tests/Makefile.am
+++ b/libmu_scm/tests/Makefile.am
@@ -14,32 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+include $(top_srcdir)/testsuite/testsuite.am
 
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >$(srcdir)/package.m4
-
-#
-
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE_AT = \
- testsuite.at\
+TESTSUITE_AT += \
  const.at\
  mailbox-open.at\
  mailbox-open-exc.at\
@@ -85,25 +62,5 @@ TESTSUITE_AT = \
  mime-get-part.at\
  mime-add-part.at
 
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE) 
-	@$(SHELL) $(TESTSUITE)
-
-# Run the test suite on the *installed* tree.
-#installcheck-local:
-#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 
 
diff --git a/libproto/dotmail/tests/Makefile.am b/libproto/dotmail/tests/Makefile.am
index cdf76c8eb..ab383921c 100644
--- a/libproto/dotmail/tests/Makefile.am
+++ b/libproto/dotmail/tests/Makefile.am
@@ -14,25 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
-
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-        } >$(srcdir)/package.m4
-
-#
+include $(top_srcdir)/testsuite/testsuite.am
 
 ## -------------------------- ##
 ## Non-installable programs
@@ -52,8 +34,7 @@ LDADD = ${MU_LIB_DOTMAIL} ${MU_LIB_MAILUTILS}
 ## Test suite.  ##
 ## ------------ ##
 
-TESTSUITE_AT = \
- testsuite.at\
+TESTSUITE_AT += \
  autodetect.at\
  count.at\
  env.at\
@@ -69,21 +50,5 @@ TESTSUITE_AT = \
  delete.at\
  setattr.at
 
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE) 
-	@$(SHELL) $(TESTSUITE)
 
 
diff --git a/mail/tests/Makefile.am b/mail/tests/Makefile.am
index bf3762f7f..4f805b5b5 100644
--- a/mail/tests/Makefile.am
+++ b/mail/tests/Makefile.am
@@ -14,31 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 
-DISTCLEANFILES       = atconfig $(check_SCRIPTS)
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+include $(top_srcdir)/testsuite/testsuite.am
 
-## ------------ ##
-## package.m4.  ##
-## ------------ ##
-
-$(srcdir)/package.m4: $(top_srcdir)/configure.ac
-	$(AM_V_GEN){                                      \
-	  echo '# Signature of the current package.'; \
-	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
-	  echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
-	  echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
-	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
-	} >$(srcdir)/package.m4
-
-#
-
-## ------------ ##
-## Test suite.  ##
-## ------------ ##
-
-TESTSUITE_AT =\
+TESTSUITE_AT +=\
  D.at\
  align.at\
  cols00.at\
@@ -53,25 +31,3 @@ TESTSUITE_AT =\
  testsuite.at\
  version.at
 
-TESTSUITE = $(srcdir)/testsuite
-M4=m4
-
-AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(TESTSUITE_AT) $(top_srcdir)/testsuite/testsuite.inc
-	$(AM_V_GEN)$(AUTOTEST) -I $(srcdir) -I $(top_srcdir)/testsuite testsuite.at -o $@.tmp
-	$(AM_V_at)mv $@.tmp $@
-
-atconfig: $(top_builddir)/config.status
-	cd $(top_builddir) && ./config.status tests/$@
-
-clean-local:
-	@test ! -f $(TESTSUITE) || $(SHELL) $(TESTSUITE) --clean
-
-check-local: atconfig atlocal $(TESTSUITE) 
-	@$(SHELL) $(TESTSUITE)
-
-# Run the test suite on the *installed* tree.
-#installcheck-local:
-#	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
-
-
diff --git a/maint/fullcheck.mk b/maint/fullcheck.mk
index 038a30cf5..c636380f4 100644
--- a/maint/fullcheck.mk
+++ b/