2 files changed, 21 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7238b9ce9..0df33c4db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2005-03-13  Sergey Poznyakoff 
 
+        * Makefile.am (SUBDIRS): Reordered. Due to the specifics
+        of gnulib imports, libmailutils depends on libmailbox.
+        Added config/.
+        * configure.ac (AC_CONFIG_FILES): Added config/Makefile
+        * lib/mailcap.c (mime_context_fill): Return integer code
+        (display_stream_mailcap): Bail out if mime_context_fill
+        returns 1
+
+        * mailbox/Makefile.am: Removed mailutils-config.c. It should
+        live in a separate directory to satisfy interlibrary dependencies.
+        * mailbox/mailutils-config.c: Moved to config
+        * config: New directory
+        * config/mailutils-config.c: New file
+        * config/Makefile.am: New file
+        
+        * po/POTFILES.in: Updated
+
+2005-03-13  Sergey Poznyakoff 
+
         * lib/mailcap.c Include ctype.h
         (mime_context_fill): Remove leading whitespace
         when preparing lists.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17a7ed0e4..f74d7704e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,8 @@
 # Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 
+config/mailutils-config.c
+
 sql/mysql.c
 sql/postgres.c
 
@@ -90,7 +92,6 @@ mailbox/argp-help.c
 mailbox/argp-parse.c
 mailbox/file_stream.c
 mailbox/filter_iconv.c
-mailbox/mailutils-config.c
 mailbox/message.c
 mailbox/mu_argp.c
 mailbox/mu_auth.c