54 files changed, 2894 insertions, 2746 deletions

diff --git a/configure.ac b/configure.ac
index 2b097f7d0..27ffc544b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1211,7 +1211,9 @@ AC_ARG_WITH([mh-bindir],
 
 # Initialize the (autotest) test suite.
 AC_CONFIG_TESTDIR(tests)
-AC_CONFIG_FILES([frm/tests/Makefile
+AC_CONFIG_FILES([libmailutils/tests/Makefile
+                 libmailutils/tests/atlocal 
+                 frm/tests/Makefile
                  frm/tests/atlocal
                  readmsg/tests/Makefile
                  readmsg/tests/atlocal
@@ -1362,7 +1364,6 @@ AC_CONFIG_FILES([
  mail/Makefile
  mail/testsuite/Makefile
  libmailutils/Makefile
- libmailutils/testsuite/Makefile
  messages/Makefile
  messages/testsuite/Makefile
  mh/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7e858d78a..c283d0db3 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -35,18 +35,13 @@ SUBDIRS = config $(CPP_DIR) python scheme
 noinst_PROGRAMS = \
  aclck\
  addr\
- argcv\
  base64\
- decode2047\
  echosrv\
- encode2047\
  header\
  http\
  iconv\
  listop\
  lsf\
- mailcap\
- mimetest\
  msg-send\
  mta\
  mucat\
@@ -56,8 +51,7 @@ noinst_PROGRAMS = \
  musocio\
  $(NNTPCLIENT)\
  $(POP3CLIENT)\
- sfrom\
- url-parse
+ sfrom
 
 EXTRA_PROGRAMS = pop3client nntpclient
 
@@ -79,15 +73,6 @@ numaddr_la_SOURCES = numaddr.c
 numaddr_la_LIBADD = ${MU_LIB_SIEVE}
 numaddr_la_LDFLAGS = -module -avoid-version -no-undefined -rpath '$(moddir)'
 
-mimetest_LDADD =\
- ../lib/libmuaux.la\
- ${MU_LIB_MBOX}\
- ${MU_LIB_IMAP}\
- ${MU_LIB_POP}\
- ${MU_LIB_AUTH}\
- @MU_AUTHLIBS@\
- ${MU_LIB_MAILUTILS}
-
 msg_send_LDADD =\
  ../lib/libmuaux.la\
  ${MU_LIB_MAILER}\
diff --git a/frm/tests/Makefile.am b/frm/tests/Makefile.am
index 647d10843..be7ac1011 100644
--- a/frm/tests/Makefile.am
+++ b/frm/tests/Makefile.am
@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 ## ------------ ##
 
 $(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@])'; \
diff --git a/frm/tests/testsuite.at b/frm/tests/testsuite.at
index eae8fc1bc..0afd41542 100644
--- a/frm/tests/testsuite.at
+++ b/frm/tests/testsuite.at
@@ -15,10 +15,7 @@
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 # This file is part of Mailfromd testsuite. 
 
-# Require a reasonably recent autotest.
-m4_version_prereq([2.52g])
-
-m4_define([AT_SKIP_TEST],[exit 77])
+m4_include([testsuite.inc])
 
 dnl ------------------------------------------------------------
 dnl FRM_MAILBOX  -- mailbox used for testing
@@ -47,8 +44,6 @@ AT_INIT
 
 AT_TESTED([frm])
 
-m4_include([testsuite.inc])
-
 MUT_VERSION(frm)
 
 FRMTEST([no options],[frm00],
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 098a9faef..9839c0a8b 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -20,7 +20,7 @@
 
 BUILT_SOURCES=errno.h debug.h
 EXTRA_DIST=errno.hin debug.hm4 types.hin
-errno.h: $(top_srcdir)/mailbox/errors errno.hin
+errno.h: $(top_srcdir)/libmailutils/errors errno.hin
         $(AM_V_GEN)$(AWK) -f $(mu_aux_dir)/generr.awk $^ > $@
 
 debug.h: $(mu_aux_dir)/debugdef.m4 debug.hm4
diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index f28b1bdbc..ea8d7389d 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -24,7 +24,7 @@ YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
 AM_YFLAGS=-vt
 AM_LFLAGS=-dvp
 
-SUBDIRS = testsuite 
+SUBDIRS = tests 
 
 lib_LTLIBRARIES = libmailutils.la