138 files changed, 517 insertions, 245 deletions
diff --git a/configure.ac b/configure.ac
index 2068a9a..c7a627d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,12 +14,11 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License along
-dnl with GNU Mailutils; if not, write to the Free Software Foundation,
-dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+dnl with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
 AC_INIT([GNU Mailutils], [2.2.90], [bug-mailutils@gnu.org], [mailutils])
-AC_CONFIG_SRCDIR([libmailutils/mailbox.c])
+AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([gnits 1.11 dist-bzip2 dist-xz std-options silent-rules])
 AC_CONFIG_HEADERS([config.h])
@@ -1377,6 +1376,18 @@ AC_CONFIG_FILES([
  maidag/Makefile
  mail/Makefile
  mail/testsuite/Makefile
+ libmailutils/auth/Makefile
+ libmailutils/base/Makefile
+ libmailutils/address/Makefile
+ libmailutils/cfg/Makefile
+ libmailutils/diag/Makefile
+ libmailutils/filter/Makefile
+ libmailutils/mailbox/Makefile
+ libmailutils/mailer/Makefile
+ libmailutils/mime/Makefile
+ libmailutils/server/Makefile
+ libmailutils/string/Makefile
+ libmailutils/stream/Makefile
  libmailutils/Makefile
  messages/Makefile
  mh/Makefile
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 13e4490..d6232f7 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)/libmailutils/errors errno.hin
+errno.h: $(top_srcdir)/libmailutils/diag/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/.gitignore b/libmailutils/.gitignore
index 8ce64ea..048e16e 100644
--- a/libmailutils/.gitignore
+++ b/libmailutils/.gitignore
@@ -4,13 +4,5 @@
 .libs
 Makefile
 Makefile.in
-T
-_*
 .gdbinit
-mailutils-config
-parsedate.c
 *y.output
-muerrno.c
-cfg_lexer.c
-cfg_parser.c
-cfg_parser.h
diff --git a/libmailutils/Makefile.am b/libmailutils/Makefile.am
index 07a0a4e..f13085f 100644
--- a/libmailutils/Makefile.am
+++ b/libmailutils/Makefile.am
@@ -1,188 +1,42 @@
-## Process this file with GNU Automake to create Makefile.in
-
-##   Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009,
-##   2010 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.
-##
-##   This program 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 this program; if not, write to the Free Software
-##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
-##   02110-1301 USA
-
-INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
-
-YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
-AM_YFLAGS=-vt
-AM_LFLAGS=-dvp
-
-SUBDIRS = . tests 
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009,
+# 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+SUBDIRS = auth base address cfg diag filter mailbox mailer mime\
+ server string stream . tests 
 
 lib_LTLIBRARIES = libmailutils.la
 
-localedir = $(datadir)/locale
-AM_CPPFLAGS = \
- -DSYSCONFDIR=\"$(sysconfdir)\"\
- -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
- -DLOCALEDIR=\"$(localedir)\"
-
-EXTRA_DIST = \
- errors\
- muerrno.cin\
- parsedate.y\
- fgetpwent.c\
- cfg_lexer.l\
- cfg_parser.y\
- cfg_parser.h
-
-libmailutils_la_SOURCES = \
- acl.c\
- address.c\
- alloc.c\
- amd.c\
- argcv.c\
- asnprintf.c\
- asprintf.c\
- assoc.c\
- attachment.c\
- attribute.c\
- auth.c\
- base64.c\
- binflt.c\
- body.c\
- cstrcasecmp.c\
- cfg_driver.c\
- cfg_format.c\
- cfg_lexer.c\
- cfg_parser.c\
- crlfdot.c\
- crlfflt.c\
- cstrlower.c\
- cstrupper.c\
- daemon.c\
- date.c\
- dbgstderr.c\
- dbgstream.c\
- dbgsyslog.c\
- debug.c\
- diag.c\
- dot.c\
- envelope.c\
- fgetpwent.c\
- file_stream.c\
- filter.c\
- filter_iconv.c\
- fltstream.c\
- folder.c\
- freeitem.c\
- fromflt.c\
- gdebug.c\
- getpass.c\
- gocs.c\
- hdritr.c\
- header.c\
- iostream.c\
- iterator.c\
- ipsrv.c\
- kwd.c\
- linelenflt.c\
- list.c\
- listlist.c\
- locale.c\
- locker.c\
- mailbox.c\
- mailcap.c\
- mailer.c\
- mapfile_stream.c\
- mbx_default.c\
- mbxitr.c\
- md5.c\
- message.c\
- memory_stream.c\
- message_stream.c\
- mime.c\
- mimehdr.c\
- mkfilename.c\
- monitor.c\
- msgscan.c\
- msrv.c\
- mu_auth.c\
- muctype.c\
- munre.c\
- mutil.c\
- muerror.c\
- muerrno.c\
- nls.c\
- nullrec.c\
- observer.c\
- opool.c\
- parse822.c\
- parsedate.c\
- permstr.c\
- progmailer.c\
- prog_stream.c\
- property.c\
- qpflt.c\
- rdcache_stream.c\
- registrar.c\
- refcount.c\
- rfc2047.c\
- sha1.c\
- secret.c\
- server.c\
- socket_stream.c\
- stdio_stream.c\
- stream.c\
- stream_printf.c\
- stream_vprintf.c\
- streamcpy.c\
- streamref.c\
- strltrim.c\
- strskip.c\
- stripws.c\
- strrtrim.c\
- syslog.c\
- system.c\
- temp_file_stream.c\
- ticket.c\
- tcp.c\
- url.c\
- vartab.c\
- vasnprintf.c\
- version.c\
- wicket.c\
- xscript-stream.c
- 
-BUILT_SOURCES = parsedate.c muerrno.c cfg_parser.c cfg_parser.h cfg_lexer.c
-MOSTLYCLEANFILES=
-
-parsedate.c: $(srcdir)/parsedate.y
-	$(YLWRAP) "$(YACC) $(AM_YFLAGS)" $< \
-	          y.tab.c parsedate.c y.output parsedate.y.output \
-                  -- -yy pd_yy
-
-cfg_parser.c cfg_parser.h: $(srcdir)/cfg_parser.y
-	$(YLWRAP) "$(YACC) $(AM_YFLAGS) -d" $< \
-	          y.tab.c cfg_parser.c y.tab.h cfg_parser.h \
-                  y.output cfg_parser.y.output \
-                  -- -yy mu_cfg_yy
-
-cfg_lexer.c: $(srcdir)/cfg_lexer.l cfg_parser.h
-	$(YLWRAP) "$(LEX) $(AM_LFLAGS) $(LFLAGS)" \
-                  $(srcdir)/cfg_lexer.l lex.yy.c cfg_lexer.c \
-                  -- -yy mu_cfg_yy
-
-muerrno.c: errors muerrno.cin
-	$(AWK) -f $(mu_aux_dir)/generr.awk $^ > $@
+libmailutils_la_SOURCES =  
+
+libmailutils_la_LIBADD = \
+ @MU_COMMON_LIBRARIES@\
+ auth/libauth.la\
+ base/libbase.la\
+ address/libaddress.la\
+ cfg/libcfg.la\
+ diag/libdiag.la\
+ filter/libfilter.la\
+ mailbox/libmailbox.la\
+ mailer/libmailer.la\
+ mime/libmime.la\
+ server/libserver.la\
+ string/libstring.la\
+ stream/libstream.la
 
-libmailutils_la_LIBADD = @MU_COMMON_LIBRARIES@
 libmailutils_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
 
diff --git a/libmailutils/address/Makefile.am b/libmailutils/address/Makefile.am
new file mode 100644
index 0000000..525fcc1
--- a/dev/null
+++ b/libmailutils/address/Makefile.am
@@ -0,0 +1,24 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libaddress.la
+
+libaddress_la_SOURCES = \
+ address.c\
+ parse822.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/address.c b/libmailutils/address/address.c
index cd151c1..cd151c1 100644
--- a/libmailutils/address.c
+++ b/libmailutils/address/address.c
diff --git a/libmailutils/parse822.c b/libmailutils/address/parse822.c
index b4d66bc..b4d66bc 100644
--- a/libmailutils/parse822.c
+++ b/libmailutils/address/parse822.c
diff --git a/libmailutils/auth/Makefile.am b/libmailutils/auth/Makefile.am
new file mode 100644
index 0000000..5a797cd
--- a/dev/null
+++ b/libmailutils/auth/Makefile.am
@@ -0,0 +1,25 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libauth.la
+
+libauth_la_SOURCES = \
+ auth.c\
+ mu_auth.c\
+ system.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/auth.c b/libmailutils/auth/auth.c
index 2d3e974..2d3e974 100644
--- a/libmailutils/auth.c
+++ b/libmailutils/auth/auth.c
diff --git a/libmailutils/mu_auth.c b/libmailutils/auth/mu_auth.c
index bba6b45..bba6b45 100644
--- a/libmailutils/mu_auth.c
+++ b/libmailutils/auth/mu_auth.c
diff --git a/libmailutils/system.c b/libmailutils/auth/system.c
index 8e28caa..8e28caa 100644
--- a/libmailutils/system.c
+++ b/libmailutils/auth/system.c
diff --git a/libmailutils/base/.gitignore b/libmailutils/base/.gitignore
new file mode 100644
index 0000000..e3e0cf0
--- a/dev/null
+++ b/libmailutils/base/.gitignore
@@ -0,0 +1 @@
+parsedate.c
diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am
new file mode 100644
index 0000000..4bb7acb
--- a/dev/null
+++ b/libmailutils/base/Makefile.am
@@ -0,0 +1,80 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libbase.la
+
+libbase_la_SOURCES = \
+ alloc.c\
+ amd.c\
+ argcv.c\
+ assoc.c\
+ daemon.c\
+ date.c\
+ fgetpwent.c\
+ freeitem.c\
+ getpass.c\
+ iterator.c\
+ kwd.c\
+ list.c\
+ listlist.c\
+ locale.c\
+ locker.c\
+ mailcap.c\
+ md5.c\
+ monitor.c\
+ munre.c\
+ mutil.c\
+ nls.c\
+ nullrec.c\
+ observer.c\
+ opool.c\
+ parsedate.c\
+ permstr.c\
+ property.c\
+ registrar.c\
+ refcount.c\
+ rfc2047.c\
+ sha1.c\
+ secret.c\
+ ticket.c\
+ url.c\
+ vartab.c\
+ version.c\
+ wicket.c
+
+localedir = $(datadir)/locale
+AM_CPPFLAGS = \
+ -DSYSCONFDIR=\"$(sysconfdir)\"\
+ -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
+ -DLOCALEDIR=\"$(localedir)\"
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+
+YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
+AM_YFLAGS=-vt
+AM_LFLAGS=-dvp
+
+EXTRA_DIST = parsedate.y
+
+BUILT_SOURCES = parsedate.c
+
+parsedate.c: $(srcdir)/parsedate.y
+	$(YLWRAP) "$(YACC) $(AM_YFLAGS)" $< \
+	          y.tab.c parsedate.c y.output parsedate.y.output \
+                  -- -yy pd_yy
+
+
diff --git a/libmailutils/alloc.c b/libmailutils/base/alloc.c
index 05801bb..05801bb 100644
--- a/libmailutils/alloc.c
+++ b/libmailutils/base/alloc.c
diff --git a/libmailutils/amd.c b/libmailutils/base/amd.c
index a5dac3f..a5dac3f 100644
--- a/libmailutils/amd.c
+++ b/libmailutils/base/amd.c
diff --git a/libmailutils/argcv.c b/libmailutils/base/argcv.c
index 636b9af..636b9af 100644
--- a/libmailutils/argcv.c
+++ b/libmailutils/base/argcv.c
diff --git a/libmailutils/assoc.c b/libmailutils/base/assoc.c
index a0c13a0..a0c13a0 100644
--- a/libmailutils/assoc.c
+++ b/libmailutils/base/assoc.c
diff --git a/libmailutils/daemon.c b/libmailutils/base/daemon.c
index b7fca61..b7fca61 100644
--- a/libmailutils/daemon.c
+++ b/libmailutils/base/daemon.c
diff --git a/libmailutils/date.c b/libmailutils/base/date.c
index d667e34..d667e34 100644
--- a/libmailutils/date.c
+++ b/libmailutils/base/date.c
diff --git a/libmailutils/fgetpwent.c b/libmailutils/base/fgetpwent.c
index 99ec9da..99ec9da 100644
--- a/libmailutils/fgetpwent.c
+++ b/libmailutils/base/fgetpwent.c
diff --git a/libmailutils/freeitem.c b/libmailutils/base/freeitem.c
index c268ea4..c268ea4 100644
--- a/libmailutils/freeitem.c
+++ b/libmailutils/base/freeitem.c
diff --git a/libmailutils/getpass.c b/libmailutils/base/getpass.c
index 8a37c52..8a37c52 100644
--- a/libmailutils/getpass.c
+++ b/libmailutils/base/getpass.c
diff --git a/libmailutils/iterator.c b/libmailutils/base/iterator.c
index 3897925..3897925 100644
--- a/libmailutils/iterator.c
+++ b/libmailutils/base/iterator.c
diff --git a/libmailutils/kwd.c b/libmailutils/base/kwd.c
index 9135f9f..9135f9f 100644
--- a/libmailutils/kwd.c
+++ b/libmailutils/base/kwd.c
diff --git a/libmailutils/list.c b/libmailutils/base/list.c
index 0045eba..0045eba 100644
--- a/libmailutils/list.c
+++ b/libmailutils/base/list.c
diff --git a/libmailutils/listlist.c b/libmailutils/base/listlist.c
index 94172ac..94172ac 100644
--- a/libmailutils/listlist.c
+++ b/libmailutils/base/listlist.c
diff --git a/libmailutils/locale.c b/libmailutils/base/locale.c
index b6bdc08..b6bdc08 100644
--- a/libmailutils/locale.c
+++ b/libmailutils/base/locale.c
diff --git a/libmailutils/locker.c b/libmailutils/base/locker.c
index 4f0dcf2..4f0dcf2 100644
--- a/libmailutils/locker.c
+++ b/libmailutils/base/locker.c
diff --git a/libmailutils/mailcap.c b/libmailutils/base/mailcap.c
index 8d8c700..8d8c700 100644
--- a/libmailutils/mailcap.c
+++ b/libmailutils/base/mailcap.c
diff --git a/libmailutils/md5.c b/libmailutils/base/md5.c
index a6d3247..a6d3247 100644
--- a/libmailutils/md5.c
+++ b/libmailutils/base/md5.c
diff --git a/libmailutils/monitor.c b/libmailutils/base/monitor.c
index 45e7dc9..45e7dc9 100644
--- a/libmailutils/monitor.c
+++ b/libmailutils/base/monitor.c
diff --git a/libmailutils/munre.c b/libmailutils/base/munre.c
index ca66cad..ca66cad 100644
--- a/libmailutils/munre.c
+++ b/libmailutils/base/munre.c
diff --git a/libmailutils/mutil.c b/libmailutils/base/mutil.c
index 2b091ce..2b091ce 100644
--- a/libmailutils/mutil.c
+++ b/libmailutils/base/mutil.c
diff --git a/libmailutils/nls.c b/libmailutils/base/nls.c
index 4b9a8fe..4b9a8fe 100644
--- a/libmailutils/nls.c
+++ b/libmailutils/base/nls.c
diff --git a/libmailutils/nullrec.c b/libmailutils/base/nullrec.c
index 9d080cd..9d080cd 100644
--- a/libmailutils/nullrec.c
+++ b/libmailutils/base/nullrec.c
diff --git a/libmailutils/observer.c b/libmailutils/base/observer.c
index 51b0260..51b0260 100644
--- a/libmailutils/observer.c
+++ b/libmailutils/base/observer.c
diff --git a/libmailutils/opool.c b/libmailutils/base/opool.c
index 991b527..991b527 100644
--- a/libmailutils/opool.c
+++ b/libmailutils/base/opool.c
diff --git a/libmailutils/parsedate.y b/libmailutils/base/parsedate.y
index 79eda8b..79eda8b 100644
--- a/libmailutils/parsedate.y
+++ b/libmailutils/base/parsedate.y
diff --git a/libmailutils/permstr.c b/libmailutils/base/permstr.c
index d3d184a..d3d184a 100644
--- a/libmailutils/permstr.c
+++ b/libmailutils/base/permstr.c
diff --git a/libmailutils/property.c b/libmailutils/base/property.c
index 435d8e2..435d8e2 100644
--- a/libmailutils/property.c
+++ b/libmailutils/base/property.c
diff --git a/libmailutils/refcount.c b/libmailutils/base/refcount.c
index 1be1fc6..1be1fc6 100644
--- a/libmailutils/refcount.c
+++ b/libmailutils/base/refcount.c
diff --git a/libmailutils/registrar.c b/libmailutils/base/registrar.c
index a1a2b4f..a1a2b4f 100644
--- a/libmailutils/registrar.c
+++ b/libmailutils/base/registrar.c
diff --git a/libmailutils/rfc2047.c b/libmailutils/base/rfc2047.c
index c30ba2f..c30ba2f 100644
--- a/libmailutils/rfc2047.c
+++ b/libmailutils/base/rfc2047.c
diff --git a/libmailutils/secret.c b/libmailutils/base/secret.c
index e472839..e472839 100644
--- a/libmailutils/secret.c
+++ b/libmailutils/base/secret.c
diff --git a/libmailutils/sha1.c b/libmailutils/base/sha1.c
index 57d6377..57d6377 100644
--- a/libmailutils/sha1.c
+++ b/libmailutils/base/sha1.c
diff --git a/libmailutils/ticket.c b/libmailutils/base/ticket.c
index ec7f609..ec7f609 100644
--- a/libmailutils/ticket.c
+++ b/libmailutils/base/ticket.c
diff --git a/libmailutils/url.c b/libmailutils/base/url.c
index d635157..d635157 100644
--- a/libmailutils/url.c
+++ b/libmailutils/base/url.c
diff --git a/libmailutils/vartab.c b/libmailutils/base/vartab.c
index 566a507..566a507 100644
--- a/libmailutils/vartab.c
+++ b/libmailutils/base/vartab.c
diff --git a/libmailutils/version.c b/libmailutils/base/version.c
index 1967dab..1967dab 100644
--- a/libmailutils/version.c
+++ b/libmailutils/base/version.c
diff --git a/libmailutils/wicket.c b/libmailutils/base/wicket.c
index 8b0fbbb..8b0fbbb 100644
--- a/libmailutils/wicket.c
+++ b/libmailutils/base/wicket.c
diff --git a/libmailutils/cfg/.gitignore b/libmailutils/cfg/.gitignore
new file mode 100644
index 0000000..473803d
--- a/dev/null
+++ b/libmailutils/cfg/.gitignore
@@ -0,0 +1,3 @@
+cfg_lexer.c
+cfg_parser.c
+cfg_parser.h
diff --git a/libmailutils/cfg/Makefile.am b/libmailutils/cfg/Makefile.am
new file mode 100644
index 0000000..b46b523
--- a/dev/null
+++ b/libmailutils/cfg/Makefile.am
@@ -0,0 +1,54 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libcfg.la
+
+libcfg_la_SOURCES = \
+ driver.c\
+ format.c\
+ lexer.c\
+ parser.c\
+ gocs.c
+
+localedir = $(datadir)/locale
+AM_CPPFLAGS = \
+ -DSYSCONFDIR=\"$(sysconfdir)\"\
+ -DLOCALEDIR=\"$(localedir)\"
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+
+EXTRA_DIST = \
+ lexer.l\
+ parser.y\
+ parser.h
+
+BUILT_SOURCES = parser.c parser.h lexer.c
+
+YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap
+AM_YFLAGS=-vt
+AM_LFLAGS=-dvp
+
+parser.c parser.h: $(srcdir)/parser.y
+	$(YLWRAP) "$(YACC) $(AM_YFLAGS) -d" $< \
+	          y.tab.c parser.c y.tab.h parser.h \
+                  y.output parser.y.output \
+                  -- -yy mu_cfg_yy
+
+lexer.c: $(srcdir)/lexer.l parser.h
+	$(YLWRAP) "$(LEX) $(AM_LFLAGS) $(LFLAGS)" \
+                  $(srcdir)/lexer.l lex.yy.c lexer.c \
+                  -- -yy mu_cfg_yy
diff --git a/libmailutils/cfg_driver.c b/libmailutils/cfg/driver.c
index f07a22f..f07a22f 100644
--- a/libmailutils/cfg_driver.c
+++ b/libmailutils/cfg/driver.c
diff --git a/libmailutils/cfg_format.c b/libmailutils/cfg/format.c
index be37bae..be37bae 100644
--- a/libmailutils/cfg_format.c
+++ b/libmailutils/cfg/format.c
diff --git a/libmailutils/gocs.c b/libmailutils/cfg/gocs.c
index 40bde9d..40bde9d 100644
--- a/libmailutils/gocs.c
+++ b/libmailutils/cfg/gocs.c
diff --git a/libmailutils/cfg_lexer.l b/libmailutils/cfg/lexer.l
index 998d84d..fa7a11a 100644
--- a/libmailutils/cfg_lexer.l
+++ b/libmailutils/cfg/lexer.l
@@ -39,7 +39,7 @@
 #include <mailutils/list.h>
 #include <mailutils/mutil.h>
   
-#include "cfg_parser.h"
+#include "parser.h"
 
 void _mu_line_begin (void);
 void _mu_line_add (char *text, size_t len);
diff --git a/libmailutils/cfg_parser.y b/libmailutils/cfg/parser.y
index f6a5397..f6a5397 100644
--- a/libmailutils/cfg_parser.y
+++ b/libmailutils/cfg/parser.y
diff --git a/libmailutils/diag/.gitignore b/libmailutils/diag/.gitignore
new file mode 100644
index 0000000..f200331
--- a/dev/null
+++ b/libmailutils/diag/.gitignore
@@ -0,0 +1 @@
+muerrno.c
diff --git a/libmailutils/diag/Makefile.am b/libmailutils/diag/Makefile.am
new file mode 100644
index 0000000..f2dae72
--- a/dev/null
+++ b/libmailutils/diag/Makefile.am
@@ -0,0 +1,42 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libdiag.la
+
+libdiag_la_SOURCES = \
+ debug.c\
+ diag.c\
+ gdebug.c\
+ muerror.c\
+ muerrno.c\
+ syslog.c\
+ dbgstderr.c\
+ dbgsyslog.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
+
+EXTRA_DIST = \
+ errors\
+ muerrno.cin
+
+BUILT_SOURCES = muerrno.c
+
+muerrno.c: errors muerrno.cin
+	$(AWK) -f $(mu_aux_dir)/generr.awk $^ > $@
+
+
+
diff --git a/libmailutils/dbgstderr.c b/libmailutils/diag/dbgstderr.c
index 9a2e164..9a2e164 100644
--- a/libmailutils/dbgstderr.c
+++ b/libmailutils/diag/dbgstderr.c
diff --git a/libmailutils/dbgsyslog.c b/libmailutils/diag/dbgsyslog.c
index f906cd3..f906cd3 100644
--- a/libmailutils/dbgsyslog.c
+++ b/libmailutils/diag/dbgsyslog.c
diff --git a/libmailutils/debug.c b/libmailutils/diag/debug.c
index d738cef..d738cef 100644
--- a/libmailutils/debug.c
+++ b/libmailutils/diag/debug.c
diff --git a/libmailutils/diag.c b/libmailutils/diag/diag.c
index 7497c82..7497c82 100644
--- a/libmailutils/diag.c
+++ b/libmailutils/diag/diag.c
diff --git a/libmailutils/errors b/libmailutils/diag/errors
index 8593c79..8593c79 100644
--- a/libmailutils/errors
+++ b/libmailutils/diag/errors
diff --git a/libmailutils/gdebug.c b/libmailutils/diag/gdebug.c
index 3d1a54c..3d1a54c 100644
--- a/libmailutils/gdebug.c
+++ b/libmailutils/diag/gdebug.c
diff --git a/libmailutils/muerrno.cin b/libmailutils/diag/muerrno.cin
index f00fb94..f00fb94 100644
--- a/libmailutils/muerrno.cin
+++ b/libmailutils/diag/muerrno.cin
diff --git a/libmailutils/muerror.c b/libmailutils/diag/muerror.c
index e18f0fe..e18f0fe 100644
--- a/libmailutils/muerror.c
+++ b/libmailutils/diag/muerror.c
diff --git a/libmailutils/syslog.c b/libmailutils/diag/syslog.c
index c97da9b..c97da9b 100644
--- a/libmailutils/syslog.c
+++ b/libmailutils/diag/syslog.c
diff --git a/libmailutils/filter/Makefile.am b/libmailutils/filter/Makefile.am
new file mode 100644
index 0000000..08082bb
--- a/dev/null
+++ b/libmailutils/filter/Makefile.am
@@ -0,0 +1,33 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libfilter.la
+
+libfilter_la_SOURCES =\
+ base64.c\
+ binflt.c\
+ crlfdot.c\
+ crlfflt.c\
+ dot.c\
+ filter.c\
+ filter_iconv.c\
+ fromflt.c\
+ linelenflt.c\
+ qpflt.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I${top_srcdir}/libmailutils
+
diff --git a/libmailutils/base64.c b/libmailutils/filter/base64.c
index 2b65cad..2b65cad 100644
--- a/libmailutils/base64.c
+++ b/libmailutils/filter/base64.c
diff --git a/libmailutils/binflt.c b/libmailutils/filter/binflt.c
index d3de518..d3de518 100644
--- a/libmailutils/binflt.c
+++ b/libmailutils/filter/binflt.c
diff --git a/libmailutils/crlfdot.c b/libmailutils/filter/crlfdot.c
index eed4519..eed4519 100644
--- a/libmailutils/crlfdot.c
+++ b/libmailutils/filter/crlfdot.c
diff --git a/libmailutils/crlfflt.c b/libmailutils/filter/crlfflt.c
index 9dc147c..9dc147c 100644
--- a/libmailutils/crlfflt.c
+++ b/libmailutils/filter/crlfflt.c
diff --git a/libmailutils/dot.c b/libmailutils/filter/dot.c
index a0d43fa..a0d43fa 100644
--- a/libmailutils/dot.c
+++ b/libmailutils/filter/dot.c
diff --git a/libmailutils/filter.c b/libmailutils/filter/filter.c
index 0008ba0..0008ba0 100644
--- a/libmailutils/filter.c
+++ b/libmailutils/filter/filter.c
diff --git a/libmailutils/filter_iconv.c b/libmailutils/filter/filter_iconv.c
index 571e8b7..571e8b7 100644
--- a/libmailutils/filter_iconv.c
+++ b/libmailutils/filter/filter_iconv.c
diff --git a/libmailutils/fromflt.c b/libmailutils/filter/fromflt.c
index d96d46d..d96d46d 100644
--- a/libmailutils/fromflt.c
+++ b/libmailutils/filter/fromflt.c
diff --git a/libmailutils/linelenflt.c b/libmailutils/filter/linelenflt.c
index e3817de..e3817de 100644
--- a/libmailutils/linelenflt.c
+++ b/libmailutils/filter/linelenflt.c
diff --git a/libmailutils/qpflt.c b/libmailutils/filter/qpflt.c
index aaada1e..aaada1e 100644
--- a/libmailutils/qpflt.c
+++ b/libmailutils/filter/qpflt.c
diff --git a/libmailutils/mailbox/Makefile.am b/libmailutils/mailbox/Makefile.am
new file mode 100644
index 0000000..5fffd57
--- a/dev/null
+++ b/libmailutils/mailbox/Makefile.am
@@ -0,0 +1,33 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libmailbox.la
+
+libmailbox_la_SOURCES =  \
+ mailbox.c\
+ mbx_default.c\
+ mbxitr.c\
+ attribute.c\
+ body.c\
+ envelope.c\
+ folder.c\
+ hdritr.c\
+ header.c\
+ message.c\
+ msgscan.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/attribute.c b/libmailutils/mailbox/attribute.c
index 3e76855..3e76855 100644
--- a/libmailutils/attribute.c
+++ b/libmailutils/mailbox/attribute.c
diff --git a/libmailutils/body.c b/libmailutils/mailbox/body.c
index 05b47f1..05b47f1 100644
--- a/libmailutils/body.c
+++ b/libmailutils/mailbox/body.c
diff --git a/libmailutils/envelope.c b/libmailutils/mailbox/envelope.c
index 1e5aa4a..1e5aa4a 100644
--- a/libmailutils/envelope.c
+++ b/libmailutils/mailbox/envelope.c
diff --git a/libmailutils/folder.c b/libmailutils/mailbox/folder.c
index 3ce430a..3ce430a 100644
--- a/libmailutils/folder.c
+++ b/libmailutils/mailbox/folder.c
diff --git a/libmailutils/hdritr.c b/libmailutils/mailbox/hdritr.c
index 595735f..595735f 100644
--- a/libmailutils/hdritr.c
+++ b/libmailutils/mailbox/hdritr.c
diff --git a/libmailutils/header.c b/libmailutils/mailbox/header.c
index 7c95e08..7c95e08 100644
--- a/libmailutils/header.c
+++ b/libmailutils/mailbox/header.c
diff --git a/libmailutils/mailbox.c b/libmailutils/mailbox/mailbox.c
index 56503f5..56503f5 100644
--- a/libmailutils/mailbox.c
+++ b/libmailutils/mailbox/mailbox.c
diff --git a/libmailutils/mbx_default.c b/libmailutils/mailbox/mbx_default.c
index 348e7f7..348e7f7 100644
--- a/libmailutils/mbx_default.c
+++ b/libmailutils/mailbox/mbx_default.c
diff --git a/libmailutils/mbxitr.c b/libmailutils/mailbox/mbxitr.c
index 8463201..8463201 100644
--- a/libmailutils/mbxitr.c
+++ b/libmailutils/mailbox/mbxitr.c
diff --git a/libmailutils/message.c b/libmailutils/mailbox/message.c
index caeba8f..caeba8f 100644
--- a/libmailutils/message.c
+++ b/libmailutils/mailbox/message.c
diff --git a/libmailutils/msgscan.c b/libmailutils/mailbox/msgscan.c
index dbbafed..dbbafed 100644
--- a/libmailutils/msgscan.c
+++ b/libmailutils/mailbox/msgscan.c
diff --git a/libmailutils/mailer/Makefile.am b/libmailutils/mailer/Makefile.am
new file mode 100644
index 0000000..1d5b242
--- a/dev/null
+++ b/libmailutils/mailer/Makefile.am
@@ -0,0 +1,24 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libmailer.la
+
+libmailer_la_SOURCES = \
+ mailer.c\
+ progmailer.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/mailer.c b/libmailutils/mailer/mailer.c
index 8faf778..8faf778 100644
--- a/libmailutils/mailer.c
+++ b/libmailutils/mailer/mailer.c
diff --git a/libmailutils/progmailer.c b/libmailutils/mailer/progmailer.c
index f39440f..f39440f 100644
--- a/libmailutils/progmailer.c
+++ b/libmailutils/mailer/progmailer.c
diff --git a/libmailutils/mime/Makefile.am b/libmailutils/mime/Makefile.am
new file mode 100644
index 0000000..70a3ebc
--- a/dev/null
+++ b/libmailutils/mime/Makefile.am
@@ -0,0 +1,25 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libmime.la
+
+libmime_la_SOURCES = \
+ attachment.c\
+ mime.c\
+ mimehdr.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/attachment.c b/libmailutils/mime/attachment.c
index c642681..c642681 100644
--- a/libmailutils/attachment.c
+++ b/libmailutils/mime/attachment.c
diff --git a/libmailutils/mime.c b/libmailutils/mime/mime.c
index 2c923cc..2c923cc 100644
--- a/libmailutils/mime.c
+++ b/libmailutils/mime/mime.c
diff --git a/libmailutils/mimehdr.c b/libmailutils/mime/mimehdr.c
index dd5eb34..dd5eb34 100644
--- a/libmailutils/mimehdr.c
+++ b/libmailutils/mime/mimehdr.c
diff --git a/libmailutils/server/Makefile.am b/libmailutils/server/Makefile.am
new file mode 100644
index 0000000..77aa154
--- a/dev/null
+++ b/libmailutils/server/Makefile.am
@@ -0,0 +1,26 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libserver.la
+
+libserver_la_SOURCES = \
+ acl.c\
+ server.c\
+ msrv.c\
+ ipsrv.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/acl.c b/libmailutils/server/acl.c
index a3e3764..a3e3764 100644
--- a/libmailutils/acl.c
+++ b/libmailutils/server/acl.c
diff --git a/libmailutils/ipsrv.c b/libmailutils/server/ipsrv.c
index e3efc62..e3efc62 100644
--- a/libmailutils/ipsrv.c
+++ b/libmailutils/server/ipsrv.c
diff --git a/libmailutils/msrv.c b/libmailutils/server/msrv.c
index 209da44..209da44 100644
--- a/libmailutils/msrv.c
+++ b/libmailutils/server/msrv.c
diff --git a/libmailutils/server.c b/libmailutils/server/server.c
index 3214fb0..3214fb0 100644
--- a/libmailutils/server.c
+++ b/libmailutils/server/server.c
diff --git a/libmailutils/size_max.h b/libmailutils/size_max.h
deleted file mode 100644
index ee3fc25..0000000
--- a/libmailutils/size_max.h
+++ b/dev/null
@@ -1,31 +0,0 @@
-/* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc.
-   Written by Simon Josefsson.
-
-   This program 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 2, or (at your option)
-   any later version.
-
-   This program 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 this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef GNULIB_SIZE_MAX_H
-#define GNULIB_SIZE_MAX_H
-
-/* Get SIZE_MAX declaration on systems like Solaris 7/8/9.  */
-# include <limits.h>
-/* Get SIZE_MAX declaration on systems like glibc 2.  */
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-/* On systems where these include files don't define it, SIZE_MAX is defined
-   in config.h.  */
-
-#endif /* GNULIB_SIZE_MAX_H */
diff --git a/libmailutils/stream/Makefile.am b/libmailutils/stream/Makefile.am
new file mode 100644
index 0000000..c68e83a
--- a/dev/null
+++ b/libmailutils/stream/Makefile.am
@@ -0,0 +1,41 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libstream.la
+
+libstream_la_SOURCES = \
+ dbgstream.c\
+ file_stream.c\
+ fltstream.c\
+ iostream.c\
+ mapfile_stream.c\
+ memory_stream.c\
+ message_stream.c\
+ prog_stream.c\
+ rdcache_stream.c\
+ socket_stream.c\
+ stdio_stream.c\
+ stream.c\
+ stream_printf.c\
+ stream_vprintf.c\
+ streamcpy.c\
+ streamref.c\
+ tcp.c\
+ temp_file_stream.c\
+ xscript-stream.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/dbgstream.c b/libmailutils/stream/dbgstream.c
index b784813..b784813 100644
--- a/libmailutils/dbgstream.c
+++ b/libmailutils/stream/dbgstream.c
diff --git a/libmailutils/file_stream.c b/libmailutils/stream/file_stream.c
index e6a6e67..e6a6e67 100644
--- a/libmailutils/file_stream.c
+++ b/libmailutils/stream/file_stream.c
diff --git a/libmailutils/fltstream.c b/libmailutils/stream/fltstream.c
index f6fe6ad..f6fe6ad 100644
--- a/libmailutils/fltstream.c
+++ b/libmailutils/stream/fltstream.c
diff --git a/libmailutils/iostream.c b/libmailutils/stream/iostream.c
index d2185f7..d2185f7 100644
--- a/libmailutils/iostream.c
+++ b/libmailutils/stream/iostream.c
diff --git a/libmailutils/mapfile_stream.c b/libmailutils/stream/mapfile_stream.c
index 3cd7c6d..3cd7c6d 100644
--- a/libmailutils/mapfile_stream.c
+++ b/libmailutils/stream/mapfile_stream.c
diff --git a/libmailutils/memory_stream.c b/libmailutils/stream/memory_stream.c
index 67952bc..67952bc 100644
--- a/libmailutils/memory_stream.c
+++ b/libmailutils/stream/memory_stream.c
diff --git a/libmailutils/message_stream.c b/libmailutils/stream/message_stream.c
index 9f590d9..9f590d9 100644
--- a/libmailutils/message_stream.c
+++ b/libmailutils/stream/message_stream.c
diff --git a/libmailutils/prog_stream.c b/libmailutils/stream/prog_stream.c
index b789def..b789def 100644
--- a/libmailutils/prog_stream.c
+++ b/libmailutils/stream/prog_stream.c
diff --git a/libmailutils/rdcache_stream.c b/libmailutils/stream/rdcache_stream.c
index c1d0013..c1d0013 100644
--- a/libmailutils/rdcache_stream.c
+++ b/libmailutils/stream/rdcache_stream.c
diff --git a/libmailutils/socket_stream.c b/libmailutils/stream/socket_stream.c
index 825a9da..825a9da 100644
--- a/libmailutils/socket_stream.c
+++ b/libmailutils/stream/socket_stream.c
diff --git a/libmailutils/stdio_stream.c b/libmailutils/stream/stdio_stream.c
index f9a5660..f9a5660 100644
--- a/libmailutils/stdio_stream.c
+++ b/libmailutils/stream/stdio_stream.c
diff --git a/libmailutils/stream.c b/libmailutils/stream/stream.c
index 6084479..6084479 100644
--- a/libmailutils/stream.c
+++ b/libmailutils/stream/stream.c
diff --git a/libmailutils/stream_printf.c b/libmailutils/stream/stream_printf.c
index 947fd3b..947fd3b 100644
--- a/libmailutils/stream_printf.c
+++ b/libmailutils/stream/stream_printf.c
diff --git a/libmailutils/stream_vprintf.c b/libmailutils/stream/stream_vprintf.c
index 5bd9c09..5bd9c09 100644
--- a/libmailutils/stream_vprintf.c
+++ b/libmailutils/stream/stream_vprintf.c
diff --git a/libmailutils/streamcpy.c b/libmailutils/stream/streamcpy.c
index 2020fad..2020fad 100644
--- a/libmailutils/streamcpy.c
+++ b/libmailutils/stream/streamcpy.c
diff --git a/libmailutils/streamref.c b/libmailutils/stream/streamref.c
index e860a55..e860a55 100644
--- a/libmailutils/streamref.c
+++ b/libmailutils/stream/streamref.c
diff --git a/libmailutils/tcp.c b/libmailutils/stream/tcp.c
index aea7809..aea7809 100644
--- a/libmailutils/tcp.c
+++ b/libmailutils/stream/tcp.c
diff --git a/libmailutils/temp_file_stream.c b/libmailutils/stream/temp_file_stream.c
index fb178a5..fb178a5 100644
--- a/libmailutils/temp_file_stream.c
+++ b/libmailutils/stream/temp_file_stream.c
diff --git a/libmailutils/xscript-stream.c b/libmailutils/stream/xscript-stream.c
index ff5d796..ff5d796 100644
--- a/libmailutils/xscript-stream.c
+++ b/libmailutils/stream/xscript-stream.c
diff --git a/libmailutils/string/Makefile.am b/libmailutils/string/Makefile.am
new file mode 100644
index 0000000..52452b9
--- a/dev/null
+++ b/libmailutils/string/Makefile.am
@@ -0,0 +1,34 @@
+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with this library.  If not, see
+# <http://www.gnu.org/licenses/>.
+
+noinst_LTLIBRARIES = libstring.la
+
+libstring_la_SOURCES = \
+ cstrcasecmp.c\
+ cstrlower.c\
+ cstrupper.c\
+ strltrim.c\
+ strskip.c\
+ stripws.c\
+ strrtrim.c\
+ asnprintf.c\
+ asprintf.c\
+ muctype.c\
+ vasnprintf.c\
+ mkfilename.c
+
+INCLUDES = @MU_LIB_COMMON_INCLUDES@ -I/libmailutils
diff --git a/libmailutils/asnprintf.c b/libmailutils/string/asnprintf.c
index f8ef543..f8ef543 100644
--- a/libmailutils/asnprintf.c
+++ b/libmailutils/string/asnprintf.c
diff --git a/libmailutils/asprintf.c b/libmailutils/string/asprintf.c
index c563bcb..c563bcb 100644
--- a/libmailutils/asprintf.c
+++ b/libmailutils/string/asprintf.c
diff --git a/libmailutils/cstrcasecmp.c b/libmailutils/string/cstrcasecmp.c
index 4baeae2..4baeae2 100644
--- a/libmailutils/cstrcasecmp.c
+++ b/libmailutils/string/cstrcasecmp.c
diff --git a/libmailutils/cstrlower.c b/libmailutils/string/cstrlower.c
index 98afb5f..98afb5f 100644
--- a/libmailutils/cstrlower.c
+++ b/libmailutils/string/cstrlower.c
diff --git a/libmailutils/cstrupper.c b/libmailutils/string/cstrupper.c
index 965977d..965977d 100644
--- a/libmailutils/cstrupper.c
+++ b/libmailutils/string/cstrupper.c
diff --git a/libmailutils/mkfilename.c b/libmailutils/string/mkfilename.c
index ecd6dee..ecd6dee 100644
--- a/libmailutils/mkfilename.c
+++ b/libmailutils/string/mkfilename.c
diff --git a/libmailutils/muctype.c b/libmailutils/string/muctype.c
index e425ffb..e425ffb 100644
--- a/libmailutils/muctype.c
+++ b/libmailutils/string/muctype.c
diff --git a/libmailutils/stripws.c b/libmailutils/string/stripws.c
index 688c8c7..688c8c7 100644
--- a/libmailutils/stripws.c
+++ b/libmailutils/string/stripws.c
diff --git a/libmailutils/strltrim.c b/libmailutils/string/strltrim.c
index e869807..e869807 100644
--- a/libmailutils/strltrim.c
+++ b/libmailutils/string/strltrim.c
diff --git a/libmailutils/strrtrim.c b/libmailutils/string/strrtrim.c
index 95e7bab..95e7bab 100644
--- a/libmailutils/strrtrim.c
+++ b/libmailutils/string/strrtrim.c
diff --git a/libmailutils/strskip.c b/libmailutils/string/strskip.c
index 5b676d0..5b676d0 100644
--- a/libmailutils/strskip.c
+++ b/libmailutils/string/strskip.c
diff --git a/libmailutils/vasnprintf.c b/libmailutils/string/vasnprintf.c
index 0f4350e..0f4350e 100644
--- a/libmailutils/vasnprintf.c
+++ b/libmailutils/string/vasnprintf.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a189a7d..30c0f15 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -120,25 +120,25 @@ mail/unalias.c
 mail/util.c
 mail/z.c
 
-libmailutils/cfg_driver.c
-libmailutils/cfg_format.c
-libmailutils/cfg_lexer.l
-libmailutils/cfg_parser.y
-libmailutils/debug.c
-libmailutils/diag.c
-libmailutils/errors
-libmailutils/file_stream.c
-libmailutils/filter_iconv.c
-libmailutils/gdebug.c
-libmailutils/gocs.c
-libmailutils/ipsrv.c
-libmailutils/message.c
-libmailutils/msrv.c
-libmailutils/mu_auth.c
-libmailutils/mutil.c
-libmailutils/parsedate.y
-libmailutils/registrar.c
-libmailutils/version.c
+libmailutils/cfg/driver.c
+libmailutils/cfg/format.c
+libmailutils/cfg/lexer.l
+libmailutils/cfg/parser.y
+libmailutils/cfg/gocs.c
+libmailutils/diag/debug.c
+libmailutils/diag/diag.c
+libmailutils/diag/errors
+libmailutils/diag/gdebug.c
+libmailutils/stream/file_stream.c
+libmailutils/filter/filter_iconv.c
+libmailutils/server/ipsrv.c
+libmailutils/server/msrv.c
+libmailutils/mailbox/message.c
+libmailutils/auth/mu_auth.c
+libmailutils/base/mutil.c
+libmailutils/base/parsedate.y
+libmailutils/base/registrar.c
+libmailutils/base/version.c
 
 messages/messages.c