2008-09-19 Marcus Brinkmann <marcus@g10code.com>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 19 Sep 2008 16:15:37 +0000 (16:15 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 19 Sep 2008 16:15:37 +0000 (16:15 +0000)
* configure.ac: Add gnutls as dependency for libetpan.
* src/Makefile.am (gpg4win_pkg_libetpan_configure): Add --with-gnutls.
Submitted by Colin Leroy.
* packages/packages.current: Update claws and libetpan.
* THANKS: New file.
* Makefile.am (EXTRA_DIST): Add ...
* patches/claws-mail-3.5.0cvs114/01-gtk-input-add.patch,
patches/claws-mail-3.5.0cvs114/02-pgpcore.patch,
patches/claws-mail-3.5.0cvs114/03-smime.patch,
patches/claws-mail-3.5.0cvs114/99-auto.patch: ... these new files.

ChangeLog
Makefile.am
THANKS [new file with mode: 0644]
configure.ac
packages/packages.current
patches/claws-mail-3.5.0cvs114/01-gtk-input-add.patch [new file with mode: 0755]
patches/claws-mail-3.5.0cvs114/02-pgpcore.patch [new file with mode: 0755]
patches/claws-mail-3.5.0cvs114/03-smime.patch [new file with mode: 0755]
patches/claws-mail-3.5.0cvs114/99-auto.patch [new file with mode: 0755]
src/Makefile.am

index 50f35f7..5cfe827 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-09-19  Marcus Brinkmann  <marcus@g10code.com>
+
+       * configure.ac: Add gnutls as dependency for libetpan.
+       * src/Makefile.am (gpg4win_pkg_libetpan_configure): Add --with-gnutls.
+       Submitted by Colin Leroy.
+       * packages/packages.current: Update claws and libetpan.
+       * THANKS: New file.
+       * Makefile.am (EXTRA_DIST): Add ...
+       * patches/claws-mail-3.5.0cvs114/01-gtk-input-add.patch,
+       patches/claws-mail-3.5.0cvs114/02-pgpcore.patch,
+       patches/claws-mail-3.5.0cvs114/03-smime.patch,
+       patches/claws-mail-3.5.0cvs114/99-auto.patch: ... these new files.
+
 2008-09-18  Werner Koch  <wk@g10code.com>
 
        * packages/packages.current: Update libgcrypt.
index af44003..5f6433b 100644 (file)
@@ -40,6 +40,10 @@ EXTRA_DIST = autogen.sh README.SVN \
        patches/claws-mail-3.4.0/03-smime-plugin.patch \
        patches/claws-mail-3.4.0/04-gnutls.patch \
        patches/claws-mail-3.4.0/99-auto.patch \
+       patches/claws-mail-3.5.0cvs114/01-gtk-input-add.patch \
+       patches/claws-mail-3.5.0cvs114/02-pgpcore.patch \
+       patches/claws-mail-3.5.0cvs114/03-smime.patch \
+       patches/claws-mail-3.5.0cvs114/99-auto.patch \
        patches/gpgme/01-gpg2.patch \
        patches/gpgme/02-kleo-bugs-workaround.patch \
        patches/libetpan-0.54/01-config.patch \
diff --git a/THANKS b/THANKS
new file mode 100644 (file)
index 0000000..6f3227f
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,20 @@
+GnuPG was originally written by g10 Code GmbH.  See the file AUTHORS
+for a full list of major contributors.  Other people contributed by
+reporting problems, suggesting various improvements or submitting
+actual code.  Here is a list of those people.  Help us keep it
+complete and free of errors.
+
+Colin Leroy            colin@colino.net
+
+The development of this software has partly been funded
+by the Bundesamt fuer Sicherheit in der Informationstechnik.
+
+ Copyright 2008 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
index 6da258a..3c09ff6 100644 (file)
@@ -208,7 +208,7 @@ GPG4WIN_SPKG([libgsasl])
 GPG4WIN_SPKG([libtasn1])
 GPG4WIN_SPKG([opencdk], [libgpg-error libgcrypt])
 GPG4WIN_SPKG([gnutls], [libgsasl libtasn1 opencdk])
-GPG4WIN_SPKG([libetpan], [pthreads-w32])
+GPG4WIN_SPKG([libetpan], [pthreads-w32 gnutls])
 GPG4WIN_SPKG([claws-mail], [libiconv gettext zlib gtk+ libpng jpeg glib dnl
                             gpgme pthreads-w32 crypt regex libetpan gnutls])
 
index d1038c0..f34fcec 100644 (file)
@@ -93,8 +93,8 @@ chk  ee059b846b6a4a969afaa104b677b42d2270be2f
 # (Kept on our own mirror due to Sourceforge peculiarities.)
 server ftp://ftp.g10code.com/mirrors/claws
 
-file libetpan-0.54.tar.gz
-chk  15c42e2b6593fc6583782f7475f7267c9ed32f47
+file libetpan-0.56.tar.gz
+chk  b75a493f6f6a82bd19acb41e459f76dc6c27e2c8
 
 #
 # Claws
@@ -102,8 +102,8 @@ chk  15c42e2b6593fc6583782f7475f7267c9ed32f47
 # (Kept on our own mirror due to Sourceforge peculiarities.)
 server ftp://ftp.g10code.com/mirrors/claws
 
-file  claws-mail-3.4.0.tar.bz2
-chk   67cf9bc9b9fe917fb4c2b895e6bc9291e5e6497c
+file  claws-mail-3.5.0cvs114.tar.bz2
+chk   7894e66b5037294b918fe1b976e7105960ff0462
 
 #
 # Pthreads for Windows.
diff --git a/patches/claws-mail-3.5.0cvs114/01-gtk-input-add.patch b/patches/claws-mail-3.5.0cvs114/01-gtk-input-add.patch
new file mode 100755 (executable)
index 0000000..a8599c6
--- /dev/null
@@ -0,0 +1,22 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+This change is probably wrong, but compiles at least.
+
+--- claws-mail-3.5.0cvs114/src/gtk/gtkutils.c.old      2008-09-19 17:44:06.000000000 +0200
++++ claws-mail-3.5.0cvs114/src/gtk/gtkutils.c  2008-09-19 17:44:21.000000000 +0200
+@@ -1613,7 +1613,6 @@ GtkUIManager *gtkut_ui_manager(void)
+       return gui_manager;
+ }
+-#ifdef G_OS_UNIX
+ #define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR)
+ #define WRITE_CONDITION (G_IO_OUT | G_IO_ERR)
+ #define EXCEPTION_CONDITION (G_IO_PRI)
+@@ -1690,5 +1689,3 @@ claws_input_add    (gint       source,
+   return result;
+ }
+-
+-#endif
diff --git a/patches/claws-mail-3.5.0cvs114/02-pgpcore.patch b/patches/claws-mail-3.5.0cvs114/02-pgpcore.patch
new file mode 100755 (executable)
index 0000000..84f70ee
--- /dev/null
@@ -0,0 +1,39 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+Add missing symbols.
+
+--- claws-mail-3.5.0cvs114/src/plugins/pgpcore/claws.def.~1.1.2.3.~    2008-08-01 20:28:37.000000000 +0200
++++ claws-mail-3.5.0cvs114/src/plugins/pgpcore/claws.def       2008-09-19 17:09:41.000000000 +0200
+@@ -12,6 +12,30 @@
+ extract_address
+ get_rc_dir
+ get_tmp_file
++gtk_cmclist_append
++gtk_cmclist_clear
++gtk_cmclist_get_row_data
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_get_type
++gtk_cmclist_new_with_titles
++gtk_cmclist_set_column_width
++gtk_cmclist_set_column_width
++gtk_cmclist_set_column_width
++gtk_cmclist_set_column_width
++gtk_cmclist_set_column_width
++gtk_cmclist_set_compare_func
++gtk_cmclist_set_compare_func
++gtk_cmclist_set_row_data_full
++gtk_cmclist_set_selection_mode
++gtk_cmclist_set_sort_type
++gtk_cmclist_sort
+ gtkut_get_options_frame
+ gtkut_stock_button_set_create
+ gtkut_window_new
diff --git a/patches/claws-mail-3.5.0cvs114/03-smime.patch b/patches/claws-mail-3.5.0cvs114/03-smime.patch
new file mode 100755 (executable)
index 0000000..223ab6f
--- /dev/null
@@ -0,0 +1,1271 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2008-09-19  Marcus Brinkmann  <marcus@g10code.de>
+
+       * Add the S/MIME 0.7.6 plugin from claws-mail-extra-plugins-3.6.0-rc1
+       straight to the source.  This makes building it so much simpler.
+
+
+diff -rupN claws-mail-3.5.0cvs114-smime/configure.ac claws-mail-3.5.0cvs114/configure.ac
+--- claws-mail-3.5.0cvs114-smime/configure.ac  2008-09-19 06:01:12.000000000 +0200
++++ claws-mail-3.5.0cvs114/configure.ac        2008-09-19 17:50:11.000000000 +0200
+@@ -1029,6 +1029,7 @@ src/plugins/trayicon/libeggtrayicon/Make
+ src/plugins/pgpcore/Makefile
+ src/plugins/pgpmime/Makefile
+ src/plugins/pgpinline/Makefile
++src/plugins/smime/Makefile
+ doc/Makefile
+ doc/man/Makefile
+ tools/Makefile
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/Makefile.am claws-mail-3.5.0cvs114/src/plugins/Makefile.am
+--- claws-mail-3.5.0cvs114-smime/src/plugins/Makefile.am       2008-01-31 09:48:25.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/Makefile.am     2008-09-19 17:50:11.000000000 +0200
+@@ -35,4 +35,5 @@ SUBDIRS = $(demo_dir) \
+       $(trayicon_dir) \
+       $(pgpcore_dir) \
+       $(pgpmime_dir) \
+-      $(pgpinline_dir)
++      $(pgpinline_dir) \
++      smime
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/claws.def claws-mail-3.5.0cvs114/src/plugins/smime/claws.def
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/claws.def   1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/claws.def 2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,28 @@
++LIBRARY CLAWS-MAIL.EXE
++EXPORTS
++alertpanel_error
++canonicalize_file_replace
++canonicalize_str
++check_plugin_version
++debug_print_real
++debug_srcname
++file_read_stream_to_str
++file_read_to_str
++generate_mime_boundary
++get_mime_tmp_dir
++get_tmp_file
++my_tmpfile
++privacy_register_system
++privacy_set_error
++privacy_unregister_system
++procmime_decode_content
++procmime_encode_content
++procmime_get_part
++procmime_mimeinfo_free_all
++procmime_mimeinfo_get_parameter
++procmime_mimeinfo_new
++procmime_mimeinfo_parent
++procmime_scan_file
++procmime_write_mime_header
++procmime_write_mimeinfo
++str_write_to_file
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/Makefile.am claws-mail-3.5.0cvs114/src/plugins/smime/Makefile.am
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/Makefile.am       2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,82 @@
++EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps
++
++if OS_WIN32
++
++LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
++     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
++     sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
++
++%.lo : %.rc
++      $(LTRCCOMPILE) -i $< -o $@
++
++plugin_res = version.lo
++plugin_res_ldflag = -Wl,.libs/version.o
++
++export_symbols = -export-symbols $(srcdir)/plugin.def
++
++plugin_deps = libclaws.a libmypgpcore.a $(plugin_res) plugin.def
++
++libclaws.a: claws.def
++      $(DLLTOOL) --output-lib $@ --def $<
++
++libmypgpcore.a: mypgpcore.def
++      $(DLLTOOL) --output-lib $@ --def $<
++
++plugin_ldadd = -L . -lclaws -lmypgpcore
++
++else
++plugin_res =
++plugin_res_ldflag =
++export_symbols =
++plugin_deps =
++plugin_ldadd =
++endif
++
++if PLATFORM_WIN32
++no_undefined = -no-undefined
++else
++no_undefined =
++endif
++
++if CYGWIN
++cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
++else
++cygwin_export_lib =
++endif
++
++plugindir = $(pkglibdir)/plugins
++plugin_DATA = smime.deps
++
++plugin_LTLIBRARIES = smime.la
++
++smime_la_SOURCES = \
++      plugin.c \
++      smime.c
++
++pluginincludedir = $(pkgincludedir)/plugins/smime
++plugininclude_HEADERS = \
++      smime.h
++
++smime_la_LDFLAGS = \
++      $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \
++      -avoid-version -module 
++smime_la_DEPENDENCIES = $(plugin_deps)
++smime_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) $(pgpcore_lib) \
++        $(GTK_LIBS) \
++      $(GPGME_LIBS)
++
++INCLUDES = \
++      -I$(top_srcdir)/src \
++      -I$(top_srcdir)/src/common \
++      -I$(top_builddir)/src/common \
++      -I$(top_srcdir)/src/gtk
++
++AM_CPPFLAGS = \
++      $(GLIB_CFLAGS) \
++      $(GTK_CFLAGS) \
++      $(GPGME_CFLAGS) \
++      -Wno-deprecated-declarations
++
++clean-local:
++      rm -f libclaws.a
++      rm -f libmypgpcore.a
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/mypgpcore.def claws-mail-3.5.0cvs114/src/plugins/smime/mypgpcore.def
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/mypgpcore.def       1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/mypgpcore.def     2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,16 @@
++LIBRARY PGPCORE.DLL
++EXPORTS
++prefs_gpg_add_skip_encryption_warning
++prefs_gpg_enable_agent
++prefs_gpg_get_config
++prefs_gpg_remove_skip_encryption_warning 
++prefs_gpg_should_skip_encryption_warning
++sgpgme_data_from_mimeinfo
++sgpgme_data_release_and_get_mem
++sgpgme_decrypt_verify
++sgpgme_get_encrypt_data
++sgpgme_setup_signers
++sgpgme_sigstat_gpgme_to_privacy
++sgpgme_sigstat_info_full
++sgpgme_sigstat_info_short
++sgpgme_verify_signature
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/plugin.c claws-mail-3.5.0cvs114/src/plugins/smime/plugin.c
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/plugin.c    1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/plugin.c  2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,90 @@
++/*
++ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
++ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
++ * the Claws Mail team
++ *
++ * 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 of the License, 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.
++ */
++
++#ifdef HAVE_CONFIG_H
++#  include "config.h"
++#endif
++
++#include <stddef.h>
++#include <glib.h>
++#include <glib/gi18n.h>
++
++#include "version.h"
++#include "common/claws.h"
++#include "smime.h"
++#include "plugin.h"
++
++gint plugin_init(gchar **error)
++{
++      if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),
++                              VERSION_NUMERIC, _("S/MIME"), error))
++              return -1;
++
++      smime_init();
++
++      return 0;       
++}
++
++gboolean plugin_done(void)
++{
++      smime_done();
++      return TRUE;
++}
++
++const gchar *plugin_name(void)
++{
++      return _("S/MIME");
++}
++
++const gchar *plugin_desc(void)
++{
++      return _("This plugin handles S/MIME signed and/or encrypted "
++               "mails. You can decrypt mails, verify signatures or "
++                 "sign and encrypt your own mails.\n"
++               "\n"
++               "It can be selected as the Default Privacy System in "
++               "/Configuration/[Account Preferences]/Privacy and when "
++               "composing a message from /Options/Privacy System\n"
++               "\n"
++               "This plugin uses the GPGME library as a wrapper for GnuPG.\n"
++               "This plugin also needs gpgsm, gnupg-agent and dirmngr "
++               "installed and configured.\n"
++               "\n"
++               "Information about how to get S/MIME certificates working "
++               "with GPGSM can be found at:\n"
++               "http://www.claws-mail.org/faq/index.php/S/MIME_howto\n"
++               "\n"
++               "GPGME is copyright 2001 by Werner Koch <dd9jn@gnu.org>");
++}
++
++const gchar *plugin_type(void)
++{
++      return "GTK2";
++}
++
++const gchar *plugin_licence(void)
++{
++      return "GPL3+";
++}
++
++const gchar *plugin_version(void)
++{
++      return VERSION;
++}
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/plugin.def claws-mail-3.5.0cvs114/src/plugins/smime/plugin.def
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/plugin.def  1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/plugin.def        2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,9 @@
++EXPORTS
++        plugin_desc
++        plugin_done
++        plugin_init
++        plugin_licence
++        plugin_name
++        plugin_type
++      plugin_provides
++        plugin_version
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/smime.c claws-mail-3.5.0cvs114/src/plugins/smime/smime.c
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/smime.c     1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/smime.c   2008-09-19 17:52:01.000000000 +0200
+@@ -0,0 +1,915 @@
++/* 
++ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
++ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
++ * the Claws Mail team
++ *
++ * 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 3 of the License, 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.
++ */
++
++#ifdef HAVE_CONFIG_H
++#  include "config.h"
++#endif
++
++#ifdef USE_GPGME
++
++#include "defs.h"
++#include <glib.h>
++#include <gpgme.h>
++#include <ctype.h>
++#include <glib/gi18n.h>
++
++#include "utils.h"
++#include "privacy.h"
++#include "procmime.h"
++
++#include "smime.h"
++#include <plugins/pgpcore/sgpgme.h>
++#include <plugins/pgpcore/prefs_gpg.h>
++#include <plugins/pgpcore/passphrase.h>
++
++#include "alertpanel.h"
++#include "prefs_common.h"
++#include "procmime.h"
++#include "plugin.h"
++
++typedef struct _PrivacyDataPGP PrivacyDataPGP;
++
++struct _PrivacyDataPGP
++{
++      PrivacyData     data;
++      
++      gboolean        done_sigtest;
++      gboolean        is_signed;
++      gpgme_verify_result_t   sigstatus;
++      gpgme_ctx_t     ctx;
++};
++
++static PrivacySystem smime_system;
++
++static gint smime_check_signature(MimeInfo *mimeinfo);
++
++static PrivacyDataPGP *smime_new_privacydata()
++{
++      PrivacyDataPGP *data;
++
++      data = g_new0(PrivacyDataPGP, 1);
++      data->data.system = &smime_system;
++      data->done_sigtest = FALSE;
++      data->is_signed = FALSE;
++      data->sigstatus = NULL;
++      gpgme_new(&data->ctx);
++      
++      return data;
++}
++
++static void smime_free_privacydata(PrivacyData *_data)
++{
++      PrivacyDataPGP *data = (PrivacyDataPGP *) _data;
++      gpgme_release(data->ctx);
++      g_free(data);
++}
++
++static gboolean smime_is_signed(MimeInfo *mimeinfo)
++{
++      MimeInfo *parent;
++      MimeInfo *signature;
++      const gchar *protocol, *tmpstr;
++      PrivacyDataPGP *data = NULL;
++      
++      g_return_val_if_fail(mimeinfo != NULL, FALSE);
++      if (mimeinfo->privacy != NULL) {
++              data = (PrivacyDataPGP *) mimeinfo->privacy;
++              if (data->done_sigtest)
++                      return data->is_signed;
++      }
++      
++      if (!g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-mime") ||
++          !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-mime")) {
++              tmpstr = procmime_mimeinfo_get_parameter(mimeinfo, "smime-type");
++              if (tmpstr && !g_ascii_strcasecmp(tmpstr, "signed-data")) {
++                      if (data == NULL) {
++                              data = smime_new_privacydata();
++                              mimeinfo->privacy = (PrivacyData *) data;
++                      }
++
++                      data->done_sigtest = TRUE;
++                      data->is_signed = TRUE;
++                      smime_check_signature(mimeinfo);
++                      return TRUE;
++              }
++      }
++
++      /* check parent */
++      parent = procmime_mimeinfo_parent(mimeinfo);
++      if (parent == NULL)
++              return FALSE;
++      
++      if ((parent->type != MIMETYPE_MULTIPART) ||
++          g_ascii_strcasecmp(parent->subtype, "signed"))
++              return FALSE;
++      protocol = procmime_mimeinfo_get_parameter(parent, "protocol");
++      if ((protocol == NULL) || 
++          (g_ascii_strcasecmp(protocol, "application/pkcs7-signature") &&
++           g_ascii_strcasecmp(protocol, "application/x-pkcs7-signature")))
++              return FALSE;
++
++      /* check if mimeinfo is the first child */
++      if (parent->node->children->data != mimeinfo)
++              return FALSE;
++
++
++      /* check signature */
++      signature = parent->node->children->next != NULL ? 
++          (MimeInfo *) parent->node->children->next->data : NULL;
++      if (signature == NULL)
++              return FALSE;
++      if ((signature->type != MIMETYPE_APPLICATION) ||
++          (g_ascii_strcasecmp(signature->subtype, "pkcs7-signature") &&
++           g_ascii_strcasecmp(signature->subtype, "x-pkcs7-signature")))
++              return FALSE;
++
++      if (data == NULL) {
++              data = smime_new_privacydata();
++              mimeinfo->privacy = (PrivacyData *) data;
++      }
++      
++      data->done_sigtest = TRUE;
++      data->is_signed = TRUE;
++
++      return TRUE;
++}
++
++static gchar *get_canonical_content(FILE *fp, const gchar *boundary)
++{
++      gchar *ret;
++      GString *textbuffer;
++      guint boundary_len = 0;
++      gchar buf[BUFFSIZE];
++
++      if (boundary) {
++              boundary_len = strlen(boundary);
++              while (fgets(buf, sizeof(buf), fp) != NULL)
++                      if (IS_BOUNDARY(buf, boundary, boundary_len))
++                              break;
++      }
++      
++      textbuffer = g_string_new("");
++      while (fgets(buf, sizeof(buf), fp) != NULL) {
++              gchar *buf2;
++
++              if (boundary && IS_BOUNDARY(buf, boundary, boundary_len))
++                      break;
++              
++              buf2 = canonicalize_str(buf);
++              g_string_append(textbuffer, buf2);
++              g_free(buf2);
++      }
++      g_string_truncate(textbuffer, textbuffer->len - 2);
++              
++      ret = textbuffer->str;
++      g_string_free(textbuffer, FALSE);
++
++      return ret;
++}
++
++static gint smime_check_signature(MimeInfo *mimeinfo)
++{
++      PrivacyDataPGP *data;
++      MimeInfo *parent, *signature;
++      FILE *fp;
++      gchar *boundary;
++      gchar *textstr;
++      const gchar *tmpstr;
++      gpgme_data_t sigdata = NULL, textdata = NULL;
++      gpgme_error_t err;
++      g_return_val_if_fail(mimeinfo != NULL, -1);
++      g_return_val_if_fail(mimeinfo->privacy != NULL, -1);
++      data = (PrivacyDataPGP *) mimeinfo->privacy;
++      gpgme_new(&data->ctx);
++      EncodingType oldenc = ENC_BINARY;
++      
++      debug_print("Checking S/MIME signature\n");
++
++      err = gpgme_set_protocol(data->ctx, GPGME_PROTOCOL_CMS);
++
++      if (err) {
++              debug_print ("gpgme_set_protocol failed: %s\n",
++                   gpgme_strerror (err));
++      }
++      parent = procmime_mimeinfo_parent(mimeinfo);
++
++      fp = g_fopen(parent->data.filename, "rb");
++      g_return_val_if_fail(fp != NULL, SIGNATURE_INVALID);
++      
++      boundary = g_hash_table_lookup(parent->typeparameters, "boundary");
++      if (!boundary) {
++              gchar *tmpfile = get_tmp_file();
++              debug_print("no boundary\n");
++              if (tmpfile) {
++                      if (mimeinfo->encoding_type != ENC_BASE64) {
++                              procmime_encode_content(mimeinfo, ENC_BASE64);
++                      }
++                      oldenc = mimeinfo->encoding_type;
++                      if (mimeinfo->encoding_type == ENC_BASE64)
++                              mimeinfo->encoding_type = ENC_BINARY;
++                      if (procmime_get_part(tmpfile, mimeinfo) == 0) {
++                              textstr = file_read_to_str(tmpfile);
++                      } else {
++                              textstr = NULL;
++                      }
++                      if (mimeinfo->encoding_type != oldenc)
++                              mimeinfo->encoding_type = oldenc;
++              }
++              g_free(tmpfile);
++      } else {
++              textstr = get_canonical_content(fp, boundary);
++      }
++      err = gpgme_data_new_from_mem(&textdata, textstr, strlen(textstr), 0);
++      
++      if (err) {
++              debug_print ("gpgme_data_new_from_mem failed: %s\n",
++                   gpgme_strerror (err));
++      }
++
++      if (!g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-mime") ||
++          !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-mime")) {
++              tmpstr = procmime_mimeinfo_get_parameter(mimeinfo, "smime-type");
++              if (tmpstr && !g_ascii_strcasecmp(tmpstr, "signed-data")) {
++                      gpgme_data_t cipher;
++                      size_t len;
++                      if (oldenc == ENC_BASE64)
++                              gpgme_data_set_encoding (textdata, GPGME_DATA_ENCODING_BASE64);
++                      gpgme_data_new(&cipher);
++                      data->sigstatus =
++                              sgpgme_verify_signature (data->ctx, textdata, NULL, cipher);
++                      gpgme_data_release(textdata);
++                      g_free(textstr);
++                      gpgme_data_rewind(cipher);
++                      textstr = sgpgme_data_release_and_get_mem(cipher, &len);
++                      fclose(fp);
++                      if (textstr && len > 0)
++                              textstr[len-1]='\0';
++
++                      if (textstr && len) {
++                              gchar *tmp_file = get_tmp_file();
++                              MimeInfo *newinfo = NULL, *decinfo = NULL, *parentinfo = NULL;
++                              gint childnumber = 0;
++                                                              
++                              str_write_to_file(textstr, tmp_file);
++                              newinfo = procmime_scan_file(tmp_file);
++                              decinfo = g_node_first_child(newinfo->node) != NULL ?
++                                      g_node_first_child(newinfo->node)->data : NULL;
++                              g_node_unlink(decinfo->node);
++                              procmime_mimeinfo_free_all(newinfo);
++                              decinfo->tmp = TRUE;
++                              parentinfo = procmime_mimeinfo_parent(mimeinfo);
++                              childnumber = g_node_child_index(parentinfo->node, mimeinfo);
++                              if (parentinfo->type == MIMETYPE_MESSAGE && 
++                                  !strcmp(parentinfo->subtype, "rfc822")) {
++                                      procmime_decode_content(parentinfo);
++                                      procmime_encode_content(parentinfo, ENC_BASE64);
++                                      procmime_encode_content(parentinfo, ENC_8BIT);
++                                      if (parentinfo->content == MIMECONTENT_MEM) {
++                                              gint newlen = 
++                                                      (gint)(strstr(parentinfo->data.mem, "\n\n") - parentinfo->data.mem);
++                                              if (newlen > 0)
++                                                      parentinfo->length = newlen;
++                                      }
++                              }
++                              g_node_prepend(parentinfo->node, decinfo->node);
++                              return 0;
++                      } else {
++                              return -1;
++                      }
++              }
++      }
++
++      signature = (MimeInfo *) mimeinfo->node->next->data;
++      sigdata = sgpgme_data_from_mimeinfo(signature);
++
++      err = 0;
++      if (signature->encoding_type == ENC_BASE64) {
++              err = gpgme_data_set_encoding (sigdata, GPGME_DATA_ENCODING_BASE64);
++      }
++      
++      if (err) {
++              debug_print ("gpgme_data_set_encoding failed: %s\n",
++                      gpgme_strerror (err));
++      }
++
++      data->sigstatus =
++              sgpgme_verify_signature (data->ctx, sigdata, textdata, NULL);
++
++      gpgme_data_release(sigdata);
++      gpgme_data_release(textdata);
++      g_free(textstr);
++      fclose(fp);
++      
++      return 0;
++}
++
++static SignatureStatus smime_get_sig_status(MimeInfo *mimeinfo)
++{
++      PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
++      
++      g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
++
++      if (data->sigstatus == NULL && 
++          prefs_gpg_get_config()->auto_check_signatures)
++              smime_check_signature(mimeinfo);
++      
++      return sgpgme_sigstat_gpgme_to_privacy(data->ctx, data->sigstatus);
++}
++
++static gchar *smime_get_sig_info_short(MimeInfo *mimeinfo)
++{
++      PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
++      
++      g_return_val_if_fail(data != NULL, g_strdup("Error"));
++
++      if (data->sigstatus == NULL && 
++          prefs_gpg_get_config()->auto_check_signatures)
++              smime_check_signature(mimeinfo);
++      
++      return sgpgme_sigstat_info_short(data->ctx, data->sigstatus);
++}
++
++static gchar *smime_get_sig_info_full(MimeInfo *mimeinfo)
++{
++      PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
++      
++      g_return_val_if_fail(data != NULL, g_strdup("Error"));
++
++      if (data->sigstatus == NULL && 
++          prefs_gpg_get_config()->auto_check_signatures)
++              smime_check_signature(mimeinfo);
++      
++      return sgpgme_sigstat_info_full(data->ctx, data->sigstatus);
++}
++
++static gboolean smime_is_encrypted(MimeInfo *mimeinfo)
++{
++      const gchar *tmpstr;
++      
++      if (mimeinfo->type != MIMETYPE_APPLICATION)
++              return FALSE;
++      if (!g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-mime")) {
++              tmpstr = procmime_mimeinfo_get_parameter(mimeinfo, "smime-type");
++              if (tmpstr && g_ascii_strcasecmp(tmpstr, "enveloped-data"))
++                      return FALSE;
++              else 
++                      return TRUE;
++
++      } else if (!g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-mime")) {
++              tmpstr = procmime_mimeinfo_get_parameter(mimeinfo, "smime-type");
++              if (tmpstr && g_ascii_strcasecmp(tmpstr, "enveloped-data"))
++                      return FALSE;
++              else 
++                      return TRUE;
++      }
++      return FALSE;
++}
++
++static MimeInfo *smime_decrypt(MimeInfo *mimeinfo)
++{
++      MimeInfo *encinfo, *decinfo, *parseinfo;
++      gpgme_data_t cipher = NULL, plain = NULL;
++      static gint id = 0;
++      FILE *dstfp;
++      gchar *fname;
++      gpgme_verify_result_t sigstat = NULL;
++      PrivacyDataPGP *data = NULL;
++      gpgme_ctx_t ctx;
++      gpgme_error_t err;
++      gchar *chars;
++      size_t len;
++
++      g_return_val_if_fail(smime_is_encrypted(mimeinfo), NULL);
++      
++      if ((err = gpgme_new(&ctx)) != GPG_ERR_NO_ERROR) {
++              privacy_set_error(_("Couldn't initialize GPG context, %s"), gpgme_strerror(err));
++              return NULL;
++      }
++
++      err = gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
++      if (err) {
++              debug_print ("gpgme_set_protocol failed: %s\n",
++                   gpgme_strerror (err));
++              privacy_set_error(_("Couldn't set GPG protocol, %s"), gpgme_strerror(err));
++              gpgme_release(ctx);
++              return NULL;
++      }
++      gpgme_set_armor(ctx, TRUE);
++
++      encinfo = mimeinfo;
++
++      cipher = sgpgme_data_from_mimeinfo(encinfo);
++      gpgme_data_set_encoding(cipher, GPGME_DATA_ENCODING_BASE64);
++      plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
++
++      gpgme_data_release(cipher);
++      if (plain == NULL) {
++              debug_print("plain is null!\n");
++              gpgme_release(ctx);
++              return NULL;
++      }
++
++      fname = g_strdup_printf("%s%cplaintext.%08x",
++              get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
++
++      if ((dstfp = g_fopen(fname, "wb")) == NULL) {
++              FILE_OP_ERROR(fname, "fopen");
++              g_free(fname);
++              gpgme_data_release(plain);
++              gpgme_release(ctx);
++              debug_print("can't open!\n");
++              privacy_set_error(_("Couldn't open temporary file"));
++              return NULL;
++      }
++
++      if (fprintf(dstfp, "MIME-Version: 1.0\n") < 0) {
++              FILE_OP_ERROR(fname, "fprintf");
++              g_free(fname);
++              gpgme_data_release(plain);
++              gpgme_release(ctx);
++              debug_print("can't close!\n");
++              privacy_set_error(_("Couldn't write to temporary file"));
++              return NULL;
++      }
++
++      chars = sgpgme_data_release_and_get_mem(plain, &len);
++
++      if (len > 0) {
++              if (fwrite(chars, 1, len, dstfp) < len) {
++                      FILE_OP_ERROR(fname, "fwrite");
++                      g_free(fname);
++                      g_free(chars);
++                      gpgme_data_release(plain);
++                      gpgme_release(ctx);
++                      debug_print("can't write!\n");
++                      privacy_set_error(_("Couldn't write to temporary file"));
++                      return NULL;
++              }
++      }
++      if (fclose(dstfp) == EOF) {
++              FILE_OP_ERROR(fname, "fclose");
++              g_free(fname);
++                      g_free(chars);
++              gpgme_data_release(plain);
++              gpgme_release(ctx);
++              debug_print("can't close!\n");
++              privacy_set_error(_("Couldn't close temporary file"));
++              return NULL;
++      }
++      g_free(chars);
++
++      parseinfo = procmime_scan_file(fname);
++      g_free(fname);
++      if (parseinfo == NULL) {
++              privacy_set_error(_("Couldn't parse decrypted file."));
++              gpgme_release(ctx);
++              return NULL;
++      }
++      decinfo = g_node_first_child(parseinfo->node) != NULL ?
++              g_node_first_child(parseinfo->node)->data : NULL;
++      if (decinfo == NULL) {
++              privacy_set_error(_("Couldn't parse decrypted file parts."));
++              gpgme_release(ctx);
++              return NULL;
++      }
++
++      g_node_unlink(decinfo->node);
++      procmime_mimeinfo_free_all(parseinfo);
++
++      decinfo->tmp = TRUE;
++
++      if (sigstat != NULL && sigstat->signatures != NULL) {
++              if (decinfo->privacy != NULL) {
++                      data = (PrivacyDataPGP *) decinfo->privacy;
++              } else {
++                      data = smime_new_privacydata();
++                      decinfo->privacy = (PrivacyData *) data;        
++              }
++              data->done_sigtest = TRUE;
++              data->is_signed = TRUE;
++              data->sigstatus = sigstat;
++              if (data->ctx)
++                      gpgme_release(data->ctx);
++              data->ctx = ctx;
++      } else
++              gpgme_release(ctx);
++      
++      
++      
++      return decinfo;
++}
++
++gboolean smime_sign(MimeInfo *mimeinfo, PrefsAccount *account)
++{
++      MimeInfo *msgcontent, *sigmultipart, *newinfo;
++      gchar *textstr, *micalg;
++      FILE *fp;
++      gchar *boundary = NULL;
++      gchar *sigcontent;
++      gpgme_ctx_t ctx;
++      gpgme_data_t gpgtext, gpgsig;
++      gpgme_error_t err;
++      size_t len;
++      struct passphrase_cb_info_s info;
++      gpgme_sign_result_t result = NULL;
++      gchar *test_msg;
++      gchar *real_content = NULL;
++      
++      fp = my_tmpfile();
++      if (fp == NULL) {
++              perror("my_tmpfile");
++              return FALSE;
++      }
++      procmime_write_mimeinfo(mimeinfo, fp);
++      rewind(fp);
++
++      /* read temporary file into memory */
++      test_msg = file_read_stream_to_str(fp);
++      fclose(fp);
++      
++      memset (&info, 0, sizeof info);
++
++      /* remove content node from message */
++      msgcontent = (MimeInfo *) mimeinfo->node->children->data;
++      g_node_unlink(msgcontent->node);
++
++      /* create temporary multipart for content */
++      sigmultipart = procmime_mimeinfo_new();
++      sigmultipart->type = MIMETYPE_MULTIPART;
++      sigmultipart->subtype = g_strdup("signed");
++      
++      do {
++              if (boundary)
++                      g_free(boundary);
++              boundary = generate_mime_boundary("Sig");
++      } while (strstr(test_msg, boundary) != NULL);
++      
++      g_free(test_msg);
++
++      g_hash_table_insert(sigmultipart->typeparameters, g_strdup("boundary"),
++                            g_strdup(boundary));
++      g_hash_table_insert(sigmultipart->typeparameters, g_strdup("protocol"),
++                            g_strdup("application/pkcs7-signature"));
++      g_node_append(sigmultipart->node, msgcontent->node);
++      g_node_append(mimeinfo->node, sigmultipart->node);
++
++      /* write message content to temporary file */
++      fp = my_tmpfile();
++      if (fp == NULL) {
++              perror("my_tmpfile");
++              return FALSE;
++      }
++      procmime_write_mimeinfo(sigmultipart, fp);
++      rewind(fp);
++
++      /* read temporary file into memory */
++      textstr = get_canonical_content(fp, boundary);
++
++      g_free(boundary);
++
++      fclose(fp);
++
++      gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
++      gpgme_data_new(&gpgsig);
++      gpgme_new(&ctx);
++      gpgme_set_armor(ctx, TRUE);
++      gpgme_signers_clear (ctx);
++
++      err = gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
++
++      if (err) {
++              debug_print ("gpgme_set_protocol failed: %s\n",
++                   gpgme_strerror (err));
++              gpgme_data_release(gpgtext);
++              gpgme_release(ctx);
++              return FALSE;
++      }
++
++      if (!sgpgme_setup_signers(ctx, account)) {
++              debug_print("setup_signers failed\n");
++              gpgme_data_release(gpgtext);
++              gpgme_release(ctx);
++              return FALSE;
++      }
++
++      info.c = ctx;
++      prefs_gpg_enable_agent(TRUE);
++      gpgme_set_passphrase_cb (ctx, NULL, &info);
++      
++      err = gpgme_op_sign(ctx, gpgtext, gpgsig, GPGME_SIG_MODE_DETACH);
++      if (err != GPG_ERR_NO_ERROR) {
++              alertpanel_error("S/MIME : Cannot sign, %s (%d)", gpg_strerror(err), gpg_err_code(err));
++              gpgme_data_release(gpgtext);
++              gpgme_release(ctx);
++              return FALSE;
++      }
++      result = gpgme_op_sign_result(ctx);
++      if (result && result->signatures) {
++          if (gpgme_get_protocol(ctx) == GPGME_PROTOCOL_OpenPGP) {
++              micalg = g_strdup_printf("PGP-%s", gpgme_hash_algo_name(
++                          result->signatures->hash_algo));
++          } else {
++              micalg = g_strdup(gpgme_hash_algo_name(
++                          result->signatures->hash_algo));
++          }
++      } else {
++          /* can't get result (maybe no signing key?) */
++          debug_print("gpgme_op_sign_result error\n");
++          return FALSE;
++      }
++
++      gpgme_release(ctx);
++      sigcontent = sgpgme_data_release_and_get_mem(gpgsig, &len);
++      gpgme_data_release(gpgtext);
++      g_free(textstr);
++
++      if (!sigcontent) {
++              gpgme_release(ctx);
++              return FALSE;
++      }
++      real_content = sigcontent+strlen("-----BEGIN SIGNED MESSAGE-----\n");
++      if (!strstr(real_content, "-----END SIGNED MESSAGE-----")) {
++              debug_print("missing end\n");
++              gpgme_release(ctx);
++              return FALSE;
++      }
++      *strstr(real_content, "-----END SIGNED MESSAGE-----") = '\0';
++      /* add signature */
++      g_hash_table_insert(sigmultipart->typeparameters, g_strdup("micalg"),
++                            micalg);
++
++      newinfo = procmime_mimeinfo_new();
++      newinfo->type = MIMETYPE_APPLICATION;
++      newinfo->subtype = g_strdup("pkcs7-signature");
++      g_hash_table_insert(newinfo->typeparameters, g_strdup("name"),
++                           g_strdup("smime.p7s"));
++      newinfo->content = MIMECONTENT_MEM;
++      newinfo->disposition = DISPOSITIONTYPE_ATTACHMENT;
++      g_hash_table_insert(newinfo->dispositionparameters, g_strdup("filename"),
++                          g_strdup("smime.p7s"));
++      newinfo->data.mem = g_malloc(len + 1);
++      g_memmove(newinfo->data.mem, real_content, len);
++      newinfo->data.mem[len] = '\0';
++      newinfo->encoding_type = ENC_BASE64;
++      g_node_append(sigmultipart->node, newinfo->node);
++
++      g_free(sigcontent);
++
++      return TRUE;
++}
++gchar *smime_get_encrypt_data(GSList *recp_names)
++{
++      return sgpgme_get_encrypt_data(recp_names, GPGME_PROTOCOL_CMS);
++}
++
++static const gchar *smime_get_encrypt_warning(void)
++{
++      if (prefs_gpg_should_skip_encryption_warning(smime_system.id))
++              return NULL;
++      else
++              return _("Please note that email headers, like Subject, "
++                       "are not encrypted by the S/MIME system.");
++}
++
++static void smime_inhibit_encrypt_warning(gboolean inhibit)
++{
++      if (inhibit)
++              prefs_gpg_add_skip_encryption_warning(smime_system.id);
++      else
++              prefs_gpg_remove_skip_encryption_warning(smime_system.id);
++}
++
++static gchar *fp_read_noconv(FILE *fp)
++{
++      GByteArray *array;
++      guchar buf[BUFSIZ];
++      gint n_read;
++      gchar *result = NULL;
++
++      if (!fp)
++              return NULL;
++      array = g_byte_array_new();
++
++      while ((n_read = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
++              if (n_read < sizeof(buf) && ferror(fp))
++                      break;
++              g_byte_array_append(array, buf, n_read);
++      }
++
++      if (ferror(fp)) {
++              FILE_OP_ERROR("file stream", "fread");
++              g_byte_array_free(array, TRUE);
++              return NULL;
++      }
++
++      buf[0] = '\0';
++      g_byte_array_append(array, buf, 1);
++      result = (gchar *)array->data;
++      g_byte_array_free(array, FALSE);
++      
++      return result;
++}
++
++gboolean smime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
++{
++      MimeInfo *msgcontent, *encmultipart;
++      FILE *fp;
++      gchar *enccontent;
++      size_t len;
++      gchar *textstr = NULL;
++      gpgme_data_t gpgtext = NULL, gpgenc = NULL;
++      gpgme_ctx_t ctx = NULL;
++      gpgme_key_t *kset = NULL;
++      gchar **fprs = g_strsplit(encrypt_data, " ", -1);
++      gint i = 0;
++      gpgme_error_t err;
++      gchar *tmpfile = NULL;
++
++      while (fprs[i] && strlen(fprs[i])) {
++              i++;
++      }
++      
++      gpgme_new(&ctx);
++
++      err = gpgme_set_protocol(ctx, GPGME_PROTOCOL_CMS);
++
++      if (err) {
++              debug_print ("gpgme_set_protocol failed: %s\n",
++                   gpgme_strerror (err));
++              return FALSE;   
++      }
++
++      kset = g_malloc(sizeof(gpgme_key_t)*(i+1));
++      memset(kset, 0, sizeof(gpgme_key_t)*(i+1));
++      i = 0;
++
++      while (fprs[i] && strlen(fprs[i])) {
++              gpgme_key_t key;
++              gpgme_error_t err;
++              err = gpgme_get_key(ctx, fprs[i], &key, 0);
++              if (err) {
++                      debug_print("can't add key '%s'[%d] (%s)\n", fprs[i],i, gpgme_strerror(err));
++                      break;
++              }
++              debug_print("found %s at %d\n", fprs[i], i);
++              kset[i] = key;
++              i++;
++      }
++      
++      debug_print("Encrypting message content\n");
++
++      /* remove content node from message */
++      msgcontent = (MimeInfo *) mimeinfo->node->children->data;
++      g_node_unlink(msgcontent->node);
++
++
++      /* create temporary multipart for content */
++      encmultipart = procmime_mimeinfo_new();
++      encmultipart->type = MIMETYPE_APPLICATION;
++      encmultipart->subtype = g_strdup("x-pkcs7-mime");
++      g_hash_table_insert(encmultipart->typeparameters, g_strdup("name"),
++                            g_strdup("smime.p7m"));
++      
++      encmultipart->disposition = DISPOSITIONTYPE_ATTACHMENT;
++      g_hash_table_insert(encmultipart->dispositionparameters, g_strdup("filename"),
++                            g_strdup("smime.p7m"));
++
++      g_node_append(encmultipart->node, msgcontent->node);
++
++      /* write message content to temporary file */
++      tmpfile = get_tmp_file();
++      fp = fopen(tmpfile, "wb");
++      if (fp == NULL) {
++              perror("get_tmp_file");
++              return FALSE;
++      }
++      procmime_decode_content(msgcontent);
++      procmime_write_mime_header(msgcontent, fp);
++      procmime_write_mimeinfo(msgcontent, fp);
++      fclose(fp);
++      canonicalize_file_replace(tmpfile);
++      fp = fopen(tmpfile, "rb");
++      if (fp == NULL) {
++              perror("get_tmp_file");
++              return FALSE;
++      }
++      g_free(tmpfile);
++
++      /* read temporary file into memory */
++      textstr = fp_read_noconv(fp);
++
++      fclose(fp);
++
++      /* encrypt data */
++      gpgme_data_new_from_mem(&gpgtext, textstr, strlen(textstr), 0);
++      gpgme_data_new(&gpgenc);
++      gpgme_data_rewind(gpgtext);
++      
++      gpgme_data_set_encoding(gpgenc, GPGME_DATA_ENCODING_BASE64);
++      gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
++
++      gpgme_release(ctx);
++      enccontent = sgpgme_data_release_and_get_mem(gpgenc, &len);
++
++      if (!enccontent) {
++              g_warning("no enccontent\n");
++              return FALSE;
++      }
++
++      tmpfile = get_tmp_file();
++      fp = fopen(tmpfile, "wb");
++      if (fp) {
++              if (fwrite(enccontent, 1, len, fp) < len) {
++                      FILE_OP_ERROR(tmpfile, "fwrite");
++                      fclose(fp);
++                      claws_unlink(tmpfile);
++                      g_free(tmpfile);
++                      return FALSE;
++              }
++              if (fclose(fp) == EOF) {
++                      FILE_OP_ERROR(tmpfile, "fclose");
++                      claws_unlink(tmpfile);
++                      g_free(tmpfile);
++                      return FALSE;
++              }
++      } else {
++              perror("get_tmp_file");
++              g_free(tmpfile);
++              return FALSE;
++      }
++      gpgme_data_release(gpgtext);
++      g_free(textstr);
++
++      /* create encrypted multipart */
++      procmime_mimeinfo_free_all(msgcontent);
++      g_node_append(mimeinfo->node, encmultipart->node);
++
++      encmultipart->content = MIMECONTENT_FILE;
++      encmultipart->data.filename = tmpfile;
++      procmime_encode_content(encmultipart, ENC_BASE64);
++
++      g_free(enccontent);
++
++      return TRUE;
++}
++
++static PrivacySystem smime_system = {
++      "smime",                        /* id */
++      "S-MIME",                       /* name */
++
++      smime_free_privacydata, /* free_privacydata */
++
++      smime_is_signed,                /* is_signed(MimeInfo *) */
++      smime_check_signature,  /* check_signature(MimeInfo *) */
++      smime_get_sig_status,           /* get_sig_status(MimeInfo *) */
++      smime_get_sig_info_short,       /* get_sig_info_short(MimeInfo *) */
++      smime_get_sig_info_full,        /* get_sig_info_full(MimeInfo *) */
++
++      smime_is_encrypted,             /* is_encrypted(MimeInfo *) */
++      smime_decrypt,                  /* decrypt(MimeInfo *) */
++
++      TRUE,
++      smime_sign,
++
++      TRUE,
++      smime_get_encrypt_data,
++      smime_encrypt,
++      smime_get_encrypt_warning,
++      smime_inhibit_encrypt_warning,
++};
++
++void smime_init()
++{
++      privacy_register_system(&smime_system);
++}
++
++void smime_done()
++{
++      privacy_unregister_system(&smime_system);
++}
++
++struct PluginFeature *plugin_provides(void)
++{
++      static struct PluginFeature features[] = 
++              { {PLUGIN_PRIVACY, N_("S/MIME")},
++                {PLUGIN_NOTHING, NULL}};
++      return features;
++}
++#endif /* USE_GPGME */
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/smime.deps claws-mail-3.5.0cvs114/src/plugins/smime/smime.deps
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/smime.deps  1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/smime.deps        2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1 @@
++pgpcore
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/smime.h claws-mail-3.5.0cvs114/src/plugins/smime/smime.h
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/smime.h     1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/smime.h   2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,27 @@
++/*
++ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
++ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
++ * the Claws Mail team
++ *
++ * 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 3 of the License, 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 PGPMIME_H
++#define PGPMIME_H 1
++
++void smime_init(void);
++void smime_done(void);
++
++#endif /* PGPMIME_H */
+diff -rupN claws-mail-3.5.0cvs114-smime/src/plugins/smime/version.rc claws-mail-3.5.0cvs114/src/plugins/smime/version.rc
+--- claws-mail-3.5.0cvs114-smime/src/plugins/smime/version.rc  1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-3.5.0cvs114/src/plugins/smime/version.rc        2008-09-19 17:50:11.000000000 +0200
+@@ -0,0 +1,36 @@
++1 VERSIONINFO
++ FILEVERSION 0, 0, 0, 0
++ PRODUCTVERSION 0, 0, 0, 0
++ FILEFLAGSMASK 0x3fL
++#ifdef _DEBUG
++ FILEFLAGS 0x1L
++#else
++ FILEFLAGS 0x0L
++#endif
++ FILEOS 0x40004L
++ FILETYPE 0x2L
++ FILESUBTYPE 0x0L
++BEGIN
++    BLOCK "StringFileInfo"
++    BEGIN
++        BLOCK "000004b0"
++        BEGIN
++            VALUE "FileDescription", "smime Plugin\0"
++            VALUE "FileVersion", "0.0.0.0\0"
++            VALUE "ProductVersion", "0.0.0.0 Win32\0"
++            VALUE "LegalCopyright", "GPL / \81© 1999-2007 Colin Leroy <colin@colino.net>\0"
++            VALUE "CompanyName", "GNU / Free Software Foundation\0"
++            VALUE "ProductName", "Claws Mail\0"
++//            VALUE "Comments", "\0"
++//            VALUE "InternalName", "\0"
++//            VALUE "LegalTrademarks", "\0"
++//            VALUE "OriginalFilename", "\0"
++//            VALUE "PrivateBuild", "\0"
++//            VALUE "SpecialBuild", "\0"
++        END
++    END
++    BLOCK "VarFileInfo"
++    BEGIN
++        VALUE "Translation", 0x0, 1200
++    END
++END
diff --git a/patches/claws-mail-3.5.0cvs114/99-auto.patch b/patches/claws-mail-3.5.0cvs114/99-auto.patch
new file mode 100755 (executable)
index 0000000..e1c401a
--- /dev/null
@@ -0,0 +1,17356 @@
+#! /bin/sh
+patch -p1 -f $* < $0
+exit $?
+
+2008-09-19  Marcus Brinkmann  <marcus@g10code.de>
+
+       * Regenerate all autotool files with
+
+$ aclocal -I m4   && libtoolize --force --copy   && autoheader   && automake --add-missing --foreign --copy   && autoconf
+
+       but removing autom4te.cache before creating the diff.
+
+
+diff -rupN claws-mail-3.5.0cvs114-auto/aclocal.m4 claws-mail-3.5.0cvs114/aclocal.m4
+--- claws-mail-3.5.0cvs114-auto/aclocal.m4     2008-09-19 06:01:32.000000000 +0200
++++ claws-mail-3.5.0cvs114/aclocal.m4  2008-09-19 17:55:18.000000000 +0200
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,6 +11,14 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(AC_AUTOCONF_VERSION, [2.61],,
++[m4_warning([this file was generated for autoconf 2.61.
++You have another version of autoconf.  It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
++
+ # gettext.m4 serial 60 (gettext-0.17)
+ dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+@@ -9018,7 +9026,7 @@ fi
+ AC_SUBST($1)dnl
+ ])
+-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -9028,14 +9036,31 @@ AC_SUBST($1)dnl
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version.  Point them to the right macro.
++m4_if([$1], [1.10.1], [],
++      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too.  Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-       [AM_AUTOMAKE_VERSION([1.9.6])])
++[AM_AUTOMAKE_VERSION([1.10.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+@@ -9092,14 +9117,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+-# serial 7
++# serial 8
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -9108,8 +9133,10 @@ AC_DEFUN([AM_CONDITIONAL],
+ [AC_PREREQ(2.52)dnl
+  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+ if $2; then
+   $1_TRUE=
+   $1_FALSE='#'
+@@ -9123,15 +9150,14 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+-# serial 8
++# serial 9
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -9159,6 +9185,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
+ ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+@@ -9224,6 +9251,7 @@ AC_CACHE_CHECK([dependency style of $dep
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -9276,7 +9304,8 @@ if test "x$enable_dependency_tracking" !
+   AMDEPBACKSLASH='\'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ ])
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+@@ -9301,8 +9330,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+     dirpart=`AS_DIRNAME("$mf")`
+   else
+     continue
+@@ -9349,14 +9379,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
+ # Do all the work for Automake.                             -*- Autoconf -*-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+-# serial 12
++# serial 13
+ # This macro actually does too much.  Some checks are only needed if
+ # your package does certain things.  But this isn't really a big deal.
+@@ -9373,16 +9403,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
++[AC_PREREQ([2.60])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++  fi
+ fi
+ # test whether we have cygpath
+@@ -9402,6 +9436,9 @@ m4_ifval([$2],
+  AC_SUBST([PACKAGE], [$1])dnl
+  AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+@@ -9437,6 +9474,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                   [_AM_DEPENDENCIES(CXX)],
+                   [define([AC_PROG_CXX],
+                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++                  [_AM_DEPENDENCIES(OBJC)],
++                  [define([AC_PROG_OBJC],
++                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ ])
+@@ -9450,16 +9491,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $1 | $1:* )
++    $_am_arg | $_am_arg:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+ #
+@@ -9472,7 +9514,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+ # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+@@ -9600,14 +9642,14 @@ rm -f confinc confmf
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+-# serial 4
++# serial 5
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -9623,6 +9665,7 @@ AC_SUBST($1)])
+ # If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+@@ -9633,7 +9676,7 @@ else
+ fi
+ ])
+-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -9641,60 +9684,23 @@ fi
+ # AM_PROG_MKDIR_P
+ # ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-#
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake.  There are at least two reasons why we must not
+-# use `-m 0755':
+-#   - it causes special bits like SGID to be ignored,
+-#   - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out.  Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
++# Check for `mkdir -p'.
+ AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
+-  else
+-    mkdir_p='$(install_sh) -d'
+-  fi
+-fi
+-AC_SUBST([mkdir_p])])
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++  [[\\/$]]* | ?:[[\\/]]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
+ # Helper functions for option handling.                     -*- Autoconf -*-
+@@ -9806,9 +9812,21 @@ dnl Don't test for $cross_compiling = ye
+ if test "$cross_compiling" != no; then
+   AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
++# Copyright (C) 2006  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+diff -rupN claws-mail-3.5.0cvs114-auto/config/Makefile.in claws-mail-3.5.0cvs114/config/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/config/Makefile.in     2008-09-19 17:01:39.000000000 +0200
++++ claws-mail-3.5.0cvs114/config/Makefile.in  2008-09-19 17:55:29.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -57,8 +53,6 @@ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -66,37 +60,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -108,8 +74,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -148,6 +112,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -179,12 +144,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -195,8 +159,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -206,8 +168,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -228,14 +188,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -247,6 +207,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -277,12 +238,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ all: all-am
+ .SUFFIXES:
+@@ -321,10 +285,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+@@ -333,22 +293,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -393,7 +352,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -407,12 +366,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+@@ -431,17 +398,20 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
+-      install-info install-info-am install-man install-strip \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
++      install-info install-info-am install-man install-pdf \
++      install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+-      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-      uninstall-info-am
++      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/configure claws-mail-3.5.0cvs114/configure
+--- claws-mail-3.5.0cvs114-auto/configure      2008-09-19 06:01:50.000000000 +0200
++++ claws-mail-3.5.0cvs114/configure   2008-09-19 17:55:31.000000000 +0200
+@@ -822,6 +822,7 @@ target_os
+ INSTALL_PROGRAM
+ INSTALL_SCRIPT
+ INSTALL_DATA
++am__isrc
+ CYGPATH_W
+ PACKAGE
+ VERSION
+@@ -2343,7 +2344,8 @@ test -n "$target_alias" &&
+     NONENONEs,x,x, &&
+   program_prefix=${target_alias}-
+-am__api_version="1.9"
++am__api_version='1.10'
++
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -2495,38 +2497,53 @@ else
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
++if test -z "$MKDIR_P"; then
++  if test "${ac_cv_path_mkdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in mkdir gmkdir; do
++       for ac_exec_ext in '' $ac_executable_extensions; do
++         { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++         case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
++           'mkdir (GNU coreutils) '* | \
++           'mkdir (coreutils) '* | \
++           'mkdir (fileutils) '4.1*)
++             ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
++             break 3;;
++         esac
++       done
++       done
++done
++IFS=$as_save_IFS
++
++fi
++
++  if test "${ac_cv_path_mkdir+set}" = set; then
++    MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+-    mkdir_p='$(install_sh) -d'
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for MKDIR_P within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the value is a relative name.
++    test -d ./--version && rmdir ./--version
++    MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++echo "${ECHO_T}$MKDIR_P" >&6; }
++
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
+ for ac_prog in gawk mawk nawk awk
+ do
+@@ -2609,12 +2626,16 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  am__isrc=' -I$(srcdir)'
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+ echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { (exit 1); exit 1; }; }
++  fi
+ fi
+ # test whether we have cygpath
+@@ -2648,7 +2669,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'.  However `strip' might not be the right
+@@ -2752,7 +2773,7 @@ else
+ fi
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+@@ -2824,9 +2845,7 @@ if test "$GNOME_CONFIG" != no; then
+       fi
+ fi
+-
+-
+-if test -n "$gnomedatadir"; then
++ if test -n "$gnomedatadir"; then
+   CLAWS_GNOME_TRUE=
+   CLAWS_GNOME_FALSE='#'
+ else
+@@ -3073,9 +3092,7 @@ else
+ echo "${ECHO_T}yes" >&6; }
+       ac_enable_gnome2=yes
+ fi
+-
+-
+-if test x"$ac_enable_gnome2" = x"yes"; then
++ if test x"$ac_enable_gnome2" = x"yes"; then
+   CLAWS_GNOME2_TRUE=
+   CLAWS_GNOME2_FALSE='#'
+ else
+@@ -3107,9 +3124,7 @@ fi
+   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+ echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+-
+-
+-if test $USE_MAINTAINER_MODE = yes; then
++   if test $USE_MAINTAINER_MODE = yes; then
+   MAINTAINER_MODE_TRUE=
+   MAINTAINER_MODE_FALSE='#'
+ else
+@@ -4092,9 +4107,7 @@ if test "x$enable_dependency_tracking" !
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+ fi
+-
+-
+-if test "x$enable_dependency_tracking" != xno; then
++ if test "x$enable_dependency_tracking" != xno; then
+   AMDEP_TRUE=
+   AMDEP_FALSE='#'
+ else
+@@ -4104,7 +4117,6 @@ fi
+-
+ depcc="$CC"   am_compiler_list=
+ { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+@@ -4172,6 +4184,7 @@ else
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -4201,9 +4214,7 @@ fi
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+-
+-
+-if
++ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+   am__fastdepCC_TRUE=
+@@ -5849,7 +5860,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5852 "configure"' > conftest.$ac_ext
++  echo '#line 5863 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7144,6 +7155,7 @@ else
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -7173,9 +7185,7 @@ fi
+ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+-
+-
+-if
++ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+   am__fastdepCXX_TRUE=
+@@ -8962,11 +8972,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8965: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8975: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8969: \$? = $ac_status" >&5
++   echo "$as_me:8979: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -9252,11 +9262,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9255: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9265: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9259: \$? = $ac_status" >&5
++   echo "$as_me:9269: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -9356,11 +9366,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9359: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9369: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9363: \$? = $ac_status" >&5
++   echo "$as_me:9373: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11733,7 +11743,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11736 "configure"
++#line 11746 "configure"
+ #include "confdefs.h"
+ #if HAVE_DLFCN_H
+@@ -11833,7 +11843,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 11836 "configure"
++#line 11846 "configure"
+ #include "confdefs.h"
+ #if HAVE_DLFCN_H
+@@ -14234,11 +14244,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14237: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14247: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14241: \$? = $ac_status" >&5
++   echo "$as_me:14251: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -14338,11 +14348,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14341: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14345: \$? = $ac_status" >&5
++   echo "$as_me:14355: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15936,11 +15946,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15939: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15949: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15943: \$? = $ac_status" >&5
++   echo "$as_me:15953: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -16040,11 +16050,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16043: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16053: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16047: \$? = $ac_status" >&5
++   echo "$as_me:16057: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18260,11 +18270,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18263: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18273: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18267: \$? = $ac_status" >&5
++   echo "$as_me:18277: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18550,11 +18560,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18553: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18563: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18557: \$? = $ac_status" >&5
++   echo "$as_me:18567: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -18654,11 +18664,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:18657: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18667: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18661: \$? = $ac_status" >&5
++   echo "$as_me:18671: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -21365,9 +21375,7 @@ case "$host" in
+ esac
+ { echo "$as_me:$LINENO: result: $platform_win32" >&5
+ echo "${ECHO_T}$platform_win32" >&6; }
+-
+-
+-if test x"$platform_win32" = x"yes"; then
++ if test x"$platform_win32" = x"yes"; then
+   PLATFORM_WIN32_TRUE=
+   PLATFORM_WIN32_FALSE='#'
+ else
+@@ -21388,9 +21396,7 @@ case "$host" in
+ esac
+ { echo "$as_me:$LINENO: result: $os_win32" >&5
+ echo "${ECHO_T}$os_win32" >&6; }
+-
+-
+-if test x"$os_win32" = x"yes"; then
++ if test x"$os_win32" = x"yes"; then
+   OS_WIN32_TRUE=
+   OS_WIN32_FALSE='#'
+ else
+@@ -21411,9 +21417,7 @@ case "$host" in
+ esac
+ { echo "$as_me:$LINENO: result: $env_cygwin" >&5
+ echo "${ECHO_T}$env_cygwin" >&6; }
+-
+-
+-if test x"$env_cygwin" = x"yes"; then
++ if test x"$env_cygwin" = x"yes"; then
+   CYGWIN_TRUE=
+   CYGWIN_FALSE='#'
+ else
+@@ -24031,9 +24035,7 @@ else
+ fi
+-
+-
+-if test x"$ac_cv_enable_manual" = xyes; then
++ if test x"$ac_cv_enable_manual" = xyes; then
+   BUILD_MANUAL_TRUE=
+   BUILD_MANUAL_FALSE='#'
+ else
+@@ -30907,9 +30909,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
++ if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
+   BUILD_TRAYICON_PLUGIN_TRUE=
+   BUILD_TRAYICON_PLUGIN_FALSE='#'
+ else
+@@ -31844,9 +31844,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
++ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
+   BUILD_SPAMASSASSIN_PLUGIN_TRUE=
+   BUILD_SPAMASSASSIN_PLUGIN_FALSE='#'
+ else
+@@ -31877,9 +31875,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_bogofilter_plugin" = xyes; then
++ if test x"$ac_cv_enable_bogofilter_plugin" = xyes; then
+   BUILD_BOGOFILTER_PLUGIN_TRUE=
+   BUILD_BOGOFILTER_PLUGIN_FALSE='#'
+ else
+@@ -32175,9 +32171,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
++ if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
+   BUILD_PGPCORE_PLUGIN_TRUE=
+   BUILD_PGPCORE_PLUGIN_FALSE='#'
+ else
+@@ -32210,9 +32204,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
++ if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
+   BUILD_PGPMIME_PLUGIN_TRUE=
+   BUILD_PGPMIME_PLUGIN_FALSE='#'
+ else
+@@ -32245,9 +32237,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_pgpinline_plugin" = xyes; then
++ if test x"$ac_cv_enable_pgpinline_plugin" = xyes; then
+   BUILD_PGPINLINE_PLUGIN_TRUE=
+   BUILD_PGPINLINE_PLUGIN_FALSE='#'
+ else
+@@ -32273,9 +32263,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_dillo_viewer_plugin" = xyes; then
++ if test x"$ac_cv_enable_dillo_viewer_plugin" = xyes; then
+   BUILD_DILLO_VIEWER_PLUGIN_TRUE=
+   BUILD_DILLO_VIEWER_PLUGIN_FALSE='#'
+ else
+@@ -32294,9 +32282,7 @@ fi
+ if test x"$ac_cv_enable_demo_plugin" = xyes; then
+       PLUGINS="demo $PLUGINS"
+ fi
+-
+-
+-if test x"$ac_cv_enable_demo_plugin" = xyes; then
++ if test x"$ac_cv_enable_demo_plugin" = xyes; then
+   BUILD_DEMO_PLUGIN_TRUE=
+   BUILD_DEMO_PLUGIN_FALSE='#'
+ else
+@@ -32574,9 +32560,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test "x$libetpan_result" = "xyes"; then
++ if test "x$libetpan_result" = "xyes"; then
+   CLAWS_LIBETPAN_TRUE=
+   CLAWS_LIBETPAN_FALSE='#'
+ else
+@@ -32767,9 +32751,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_gnomeprint" = x"yes"; then
++ if test x"$ac_cv_enable_gnomeprint" = x"yes"; then
+   CLAWS_GNOMEPRINT_TRUE=
+   CLAWS_GNOMEPRINT_FALSE='#'
+ else
+@@ -32875,9 +32857,7 @@ else
+       { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+-
+-
+-if test x"$ac_cv_enable_valgrind" = x"yes"; then
++ if test x"$ac_cv_enable_valgrind" = x"yes"; then
+   CLAWS_VALGRIND_TRUE=
+   CLAWS_VALGRIND_FALSE='#'
+ else
+@@ -32887,7 +32867,7 @@ fi
+-ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in src/common/version.h src/Makefile src/common/Makefile src/common/passcrypt.h src/gtk/Makefile src/etpan/Makefile src/plugins/Makefile src/plugins/demo/Makefile src/plugins/bogofilter/Makefile src/plugins/spamassassin/Makefile src/plugins/dillo_viewer/Makefile src/plugins/trayicon/Makefile src/plugins/trayicon/libeggtrayicon/Makefile src/plugins/pgpcore/Makefile src/plugins/pgpmime/Makefile src/plugins/pgpinline/Makefile doc/Makefile doc/man/Makefile tools/Makefile config/Makefile manual/Makefile manual/dtd/Makefile manual/dist/Makefile manual/dist/pdf/Makefile manual/dist/ps/Makefile manual/dist/html/Makefile manual/dist/txt/Makefile manual/fr/Makefile manual/fr/dist/Makefile manual/fr/dist/pdf/Makefile manual/fr/dist/ps/Makefile manual/fr/dist/html/Makefile manual/fr/dist/txt/Makefile manual/pl/Makefile manual/pl/dist/Makefile manual/pl/dist/pdf/Makefile manual/pl/dist/ps/Makefile manual/pl/dist/html/Makefile manual/pl/dist/txt/Makefile manual/es/Makefile manual/es/dist/Makefile manual/es/dist/pdf/Makefile manual/es/dist/ps/Makefile manual/es/dist/html/Makefile manual/es/dist/txt/Makefile claws-mail.pc"
++ac_config_files="$ac_config_files Makefile m4/Makefile po/Makefile.in src/common/version.h src/Makefile src/common/Makefile src/common/passcrypt.h src/gtk/Makefile src/etpan/Makefile src/plugins/Makefile src/plugins/demo/Makefile src/plugins/bogofilter/Makefile src/plugins/spamassassin/Makefile src/plugins/dillo_viewer/Makefile src/plugins/trayicon/Makefile src/plugins/trayicon/libeggtrayicon/Makefile src/plugins/pgpcore/Makefile src/plugins/pgpmime/Makefile src/plugins/pgpinline/Makefile src/plugins/smime/Makefile doc/Makefile doc/man/Makefile tools/Makefile config/Makefile manual/Makefile manual/dtd/Makefile manual/dist/Makefile manual/dist/pdf/Makefile manual/dist/ps/Makefile manual/dist/html/Makefile manual/dist/txt/Makefile manual/fr/Makefile manual/fr/dist/Makefile manual/fr/dist/pdf/Makefile manual/fr/dist/ps/Makefile manual/fr/dist/html/Makefile manual/fr/dist/txt/Makefile manual/pl/Makefile manual/pl/dist/Makefile manual/pl/dist/pdf/Makefile manual/pl/dist/ps/Makefile manual/pl/dist/html/Makefile manual/pl/dist/txt/Makefile manual/es/Makefile manual/es/dist/Makefile manual/es/dist/pdf/Makefile manual/es/dist/ps/Makefile manual/es/dist/html/Makefile manual/es/dist/txt/Makefile claws-mail.pc"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -33496,6 +33476,7 @@ gives unlimited permission to copy, dist
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -33627,6 +33608,7 @@ do
+     "src/plugins/pgpcore/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pgpcore/Makefile" ;;
+     "src/plugins/pgpmime/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pgpmime/Makefile" ;;
+     "src/plugins/pgpinline/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/pgpinline/Makefile" ;;
++    "src/plugins/smime/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/smime/Makefile" ;;
+     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+     "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
+     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+@@ -33771,6 +33753,7 @@ target_os!$target_os$ac_delim
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
++am__isrc!$am__isrc$ac_delim
+ CYGPATH_W!$CYGPATH_W$ac_delim
+ PACKAGE!$PACKAGE$ac_delim
+ VERSION!$VERSION$ac_delim
+@@ -33815,7 +33798,6 @@ LDFLAGS!$LDFLAGS$ac_delim
+ CPPFLAGS!$CPPFLAGS$ac_delim
+ ac_ct_CC!$ac_ct_CC$ac_delim
+ EXEEXT!$EXEEXT$ac_delim
+-OBJEXT!$OBJEXT$ac_delim
+ _ACEOF
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -33857,6 +33839,7 @@ _ACEOF
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++OBJEXT!$OBJEXT$ac_delim
+ DEPDIR!$DEPDIR$ac_delim
+ am__include!$am__include$ac_delim
+ am__quote!$am__quote$ac_delim
+@@ -33953,7 +33936,6 @@ DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
+ DBUS_LIBS!$DBUS_LIBS$ac_delim
+ NETWORKMANAGER_SUPPORT_CFLAGS!$NETWORKMANAGER_SUPPORT_CFLAGS$ac_delim
+ NETWORKMANAGER_SUPPORT_LIBS!$NETWORKMANAGER_SUPPORT_LIBS$ac_delim
+-BUILD_TRAYICON_PLUGIN_TRUE!$BUILD_TRAYICON_PLUGIN_TRUE$ac_delim
+ _ACEOF
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -33995,6 +33977,7 @@ _ACEOF
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++BUILD_TRAYICON_PLUGIN_TRUE!$BUILD_TRAYICON_PLUGIN_TRUE$ac_delim
+ BUILD_TRAYICON_PLUGIN_FALSE!$BUILD_TRAYICON_PLUGIN_FALSE$ac_delim
+ BUILD_SPAMASSASSIN_PLUGIN_TRUE!$BUILD_SPAMASSASSIN_PLUGIN_TRUE$ac_delim
+ BUILD_SPAMASSASSIN_PLUGIN_FALSE!$BUILD_SPAMASSASSIN_PLUGIN_FALSE$ac_delim
+@@ -34032,7 +34015,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -34259,6 +34242,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++  ac_MKDIR_P=$MKDIR_P
++  case $MKDIR_P in
++  [\\/$]* | ?:[\\/]* ) ;;
++  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++  esac
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -34312,6 +34300,7 @@ s&@builddir@&$ac_builddir&;t t
+ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
++s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+@@ -34427,21 +34416,22 @@ echo "$as_me: $ac_file is unchanged" >&6
+   fi
+   rm -f "$tmp/out12"
+ # Compute $ac_file's index in $config_headers.
++_am_arg=$ac_file
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $ac_file | $ac_file:* )
++    $_am_arg | $_am_arg:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-       X$ac_file : 'X\(//\)[^/]' \| \
+-       X$ac_file : 'X\(//\)$' \| \
+-       X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+-echo X$ac_file |
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++       X"$_am_arg" : 'X\(//\)[^/]' \| \
++       X"$_am_arg" : 'X\(//\)$' \| \
++       X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++echo X"$_am_arg" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+           s//\1/
+           q
+@@ -34476,8 +34466,9 @@ echo "$as_me: executing $ac_file command
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++  # Grep'ing the whole file is not good either: AIX grep has a line
++  # limit of 2048, but all sed's we know have understand at least 4000.
++  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+     dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$mf" : 'X\(//\)[^/]' \| \
+diff -rupN claws-mail-3.5.0cvs114-auto/doc/Makefile.in claws-mail-3.5.0cvs114/doc/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/doc/Makefile.in        2008-09-19 17:01:28.000000000 +0200
++++ claws-mail-3.5.0cvs114/doc/Makefile.in     2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = man
+ all: all-recursive
+@@ -330,10 +297,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -365,8 +328,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -410,8 +372,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -436,8 +398,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -447,13 +409,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -467,22 +428,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -496,7 +456,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -504,6 +464,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -543,8 +505,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -558,12 +519,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -582,22 +551,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/doc/man/Makefile.in claws-mail-3.5.0cvs114/doc/man/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/doc/man/Makefile.in    2008-09-19 17:01:29.000000000 +0200
++++ claws-mail-3.5.0cvs114/doc/man/Makefile.in 2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,8 +55,6 @@ MANS = $(man_MANS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -68,37 +62,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -110,8 +76,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -150,6 +114,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -181,12 +146,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -197,8 +161,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -208,8 +170,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -230,14 +190,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -249,6 +209,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -279,12 +240,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ man_MANS = \
+      claws-mail.1
+@@ -327,13 +291,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-man1: $(man1_MANS) $(man_MANS)
+       @$(NORMAL_INSTALL)
+-      test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++      test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+       @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+       l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+       for i in $$l2; do \
+@@ -384,22 +344,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -415,7 +374,7 @@ check: check-am
+ all-am: Makefile $(MANS)
+ installdirs:
+       for dir in "$(DESTDIR)$(man1dir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -447,7 +406,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -461,12 +420,20 @@ info-am:
+ install-data-am: install-man
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man: install-man1
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+@@ -485,20 +452,23 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-man
++uninstall-am: uninstall-man
+ uninstall-man: uninstall-man1
++.MAKE: install-am install-strip
++
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-man1 \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am uninstall-man \
+-      uninstall-man1
++      uninstall uninstall-am uninstall-man uninstall-man1
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/m4/Makefile.in claws-mail-3.5.0cvs114/m4/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/m4/Makefile.in 2008-09-19 17:01:29.000000000 +0200
++++ claws-mail-3.5.0cvs114/m4/Makefile.in      2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,8 +51,6 @@ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -64,37 +58,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -106,8 +72,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -146,6 +110,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -177,12 +142,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -193,8 +157,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -204,8 +166,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -226,14 +186,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -245,6 +205,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -275,12 +236,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ MACROS = \
+       aclocal-include.m4 \
+       check-type.m4 \
+@@ -332,10 +296,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+@@ -344,23 +304,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      $(mkdir_p) $(distdir)/missing
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -405,7 +363,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -419,12 +377,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+@@ -443,17 +409,20 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
+-      install-info install-info-am install-man install-strip \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
++      install-info install-info-am install-man install-pdf \
++      install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+-      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-      uninstall-info-am
++      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/Makefile.in claws-mail-3.5.0cvs114/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/Makefile.in    2008-09-19 17:01:28.000000000 +0200
++++ claws-mail-3.5.0cvs114/Makefile.in 2008-09-19 17:55:23.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
++ configure.lineno config.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = claws-mail.pc
+@@ -62,10 +58,11 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -83,6 +80,8 @@ DATA = $(gnomap_DATA) $(pixmap_DATA) $(p
+       $(relnotes_DATA)
+ clawsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(clawsinclude_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = m4 po src tools config doc manual
+@@ -99,8 +98,6 @@ distuninstallcheck_listfiles = find . -t
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -108,37 +105,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -150,8 +119,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -190,6 +157,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -221,12 +189,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -237,8 +204,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -248,8 +213,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -270,14 +233,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -289,6 +252,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -319,12 +283,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = dist-bzip2
+ @PLATFORM_WIN32_FALSE@tools = tools
+@@ -399,7 +366,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
+ config.h: stamp-h1
+       @if test ! -f $@; then \
+         rm -f stamp-h1; \
+-        $(MAKE) stamp-h1; \
++        $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+       else :; fi
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -423,10 +390,9 @@ clean-libtool:
+ distclean-libtool:
+       -rm -f libtool
+-uninstall-info-am:
+ install-gnomapDATA: $(gnomap_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(gnomapdir)" || $(mkdir_p) "$(DESTDIR)$(gnomapdir)"
++      test -z "$(gnomapdir)" || $(MKDIR_P) "$(DESTDIR)$(gnomapdir)"
+       @list='$(gnomap_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -443,7 +409,7 @@ uninstall-gnomapDATA:
+       done
+ install-pixmapDATA: $(pixmap_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
++      test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
+       @list='$(pixmap_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -460,7 +426,7 @@ uninstall-pixmapDATA:
+       done
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
++      test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+       @list='$(pkgconfig_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -477,7 +443,7 @@ uninstall-pkgconfigDATA:
+       done
+ install-relnotesDATA: $(relnotes_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(relnotesdir)" || $(mkdir_p) "$(DESTDIR)$(relnotesdir)"
++      test -z "$(relnotesdir)" || $(MKDIR_P) "$(DESTDIR)$(relnotesdir)"
+       @list='$(relnotes_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -494,7 +460,7 @@ uninstall-relnotesDATA:
+       done
+ install-clawsincludeHEADERS: $(clawsinclude_HEADERS)
+       @$(NORMAL_INSTALL)
+-      test -z "$(clawsincludedir)" || $(mkdir_p) "$(DESTDIR)$(clawsincludedir)"
++      test -z "$(clawsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(clawsincludedir)"
+       @list='$(clawsinclude_HEADERS)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -541,8 +507,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -586,8 +551,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -612,8 +577,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -623,13 +588,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -644,24 +608,22 @@ distclean-tags:
+ distdir: $(DISTFILES)
+       $(am__remove_distdir)
+-      mkdir $(distdir)
+-      $(mkdir_p) $(distdir)/. $(distdir)/m4 $(distdir)/po $(distdir)/src/common
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      test -d $(distdir) || mkdir $(distdir)
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -675,7 +637,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -683,6 +645,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -690,7 +654,7 @@ distdir: $(DISTFILES)
+       -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+         ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+         ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+-        ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
++        ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+       || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+@@ -699,6 +663,10 @@ dist-bzip2: distdir
+       tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+       $(am__remove_distdir)
++dist-lzma: distdir
++      tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++      $(am__remove_distdir)
++
+ dist-tarZ: distdir
+       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+       $(am__remove_distdir)
+@@ -726,6 +694,8 @@ distcheck: dist
+         GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+       *.tar.bz2*) \
+         bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++      *.tar.lzma*) \
++        unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+       *.tar.Z*) \
+         uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+       *.shar.gz*) \
+@@ -765,7 +735,7 @@ distcheck: dist
+       $(am__remove_distdir)
+       @(echo "$(distdir) archives ready for distribution: "; \
+         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+-        sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++        sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+       @cd $(distuninstallcheck_dir) \
+       && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -790,7 +760,7 @@ all-am: Makefile $(DATA) $(HEADERS) conf
+ installdirs: installdirs-recursive
+ installdirs-am:
+       for dir in "$(DESTDIR)$(gnomapdir)" "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(relnotesdir)" "$(DESTDIR)$(clawsincludedir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -842,12 +812,20 @@ install-data-am: install-clawsincludeHEA
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -869,30 +847,32 @@ ps: ps-recursive
+ ps-am:
+ uninstall-am: uninstall-clawsincludeHEADERS uninstall-gnomapDATA \
+-      uninstall-info-am uninstall-pixmapDATA uninstall-pkgconfigDATA \
++      uninstall-pixmapDATA uninstall-pkgconfigDATA \
+       uninstall-relnotesDATA
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-data-am install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+-      check-am clean clean-generic clean-libtool clean-recursive \
+-      ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+-      dist-shar dist-tarZ dist-zip distcheck distclean \
+-      distclean-generic distclean-hdr distclean-libtool \
+-      distclean-recursive distclean-tags distcleancheck distdir \
+-      distuninstallcheck dvi dvi-am html html-am info info-am \
+-      install install-am install-clawsincludeHEADERS install-data \
+-      install-data-am install-data-hook install-exec install-exec-am \
+-      install-gnomapDATA install-info install-info-am install-man \
+-      install-pixmapDATA install-pkgconfigDATA install-relnotesDATA \
+-      install-strip installcheck installcheck-am installdirs \
+-      installdirs-am maintainer-clean maintainer-clean-generic \
+-      maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-      mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-      tags tags-recursive uninstall uninstall-am \
+-      uninstall-clawsincludeHEADERS uninstall-gnomapDATA \
+-      uninstall-info-am uninstall-pixmapDATA uninstall-pkgconfigDATA \
+-      uninstall-relnotesDATA
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am am--refresh check check-am clean clean-generic \
++      clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
++      dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++      distclean distclean-generic distclean-hdr distclean-libtool \
++      distclean-tags distcleancheck distdir distuninstallcheck dvi \
++      dvi-am html html-am info info-am install install-am \
++      install-clawsincludeHEADERS install-data install-data-am \
++      install-data-hook install-dvi install-dvi-am install-exec \
++      install-exec-am install-gnomapDATA install-html \
++      install-html-am install-info install-info-am install-man \
++      install-pdf install-pdf-am install-pixmapDATA \
++      install-pkgconfigDATA install-ps install-ps-am \
++      install-relnotesDATA install-strip installcheck \
++      installcheck-am installdirs installdirs-am maintainer-clean \
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am uninstall-clawsincludeHEADERS \
++      uninstall-gnomapDATA uninstall-pixmapDATA \
++      uninstall-pkgconfigDATA uninstall-relnotesDATA
+ @CLAWS_GNOME2_TRUE@install-data-hook:
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/dist/html/Makefile.in claws-mail-3.5.0cvs114/manual/dist/html/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/dist/html/Makefile.in   2008-09-19 17:01:29.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/dist/html/Makefile.in        2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualen_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.html
+ manualen_DATA = claws-mail-manual.html
+ manualendir = $(manualdir)/en
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualenDATA: $(manualen_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualendir)" || $(mkdir_p) "$(DESTDIR)$(manualendir)"
++      test -z "$(manualendir)" || $(MKDIR_P) "$(DESTDIR)$(manualendir)"
+       @list='$(manualen_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualendir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualenDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualenDATA
++uninstall-am: uninstall-manualenDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualenDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualenDATA
++      uninstall uninstall-am uninstall-manualenDATA
+ claws-mail-manual.html: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/dist/Makefile.in claws-mail-3.5.0cvs114/manual/dist/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/dist/Makefile.in        2008-09-19 17:01:29.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/dist/Makefile.in     2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = html pdf ps txt
+ all: all-recursive
+@@ -330,10 +297,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -365,8 +328,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -410,8 +372,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -436,8 +398,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -447,13 +409,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -467,22 +428,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -496,7 +456,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -504,6 +464,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -543,8 +505,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -558,12 +519,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -582,22 +551,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/dist/pdf/Makefile.in claws-mail-3.5.0cvs114/manual/dist/pdf/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/dist/pdf/Makefile.in    2008-09-19 17:01:30.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/dist/pdf/Makefile.in 2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualen_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.pdf
+ manualen_DATA = claws-mail-manual.pdf
+ manualendir = $(manualdir)/en
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualenDATA: $(manualen_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualendir)" || $(mkdir_p) "$(DESTDIR)$(manualendir)"
++      test -z "$(manualendir)" || $(MKDIR_P) "$(DESTDIR)$(manualendir)"
+       @list='$(manualen_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualendir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualenDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualenDATA
++uninstall-am: uninstall-manualenDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualenDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualenDATA
++      uninstall uninstall-am uninstall-manualenDATA
+ claws-mail-manual.pdf: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/dist/ps/Makefile.in claws-mail-3.5.0cvs114/manual/dist/ps/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/dist/ps/Makefile.in     2008-09-19 17:01:30.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/dist/ps/Makefile.in  2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualen_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.ps
+ manualen_DATA = claws-mail-manual.ps
+ manualendir = $(manualdir)/en
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualenDATA: $(manualen_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualendir)" || $(mkdir_p) "$(DESTDIR)$(manualendir)"
++      test -z "$(manualendir)" || $(MKDIR_P) "$(DESTDIR)$(manualendir)"
+       @list='$(manualen_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualendir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualenDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualenDATA
++uninstall-am: uninstall-manualenDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualenDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualenDATA
++      uninstall uninstall-am uninstall-manualenDATA
+ claws-mail-manual.ps: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/dist/txt/Makefile.in claws-mail-3.5.0cvs114/manual/dist/txt/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/dist/txt/Makefile.in    2008-09-19 17:01:30.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/dist/txt/Makefile.in 2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualen_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.txt
+ manualen_DATA = claws-mail-manual.txt
+ manualendir = $(manualdir)/en
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualenDATA: $(manualen_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualendir)" || $(mkdir_p) "$(DESTDIR)$(manualendir)"
++      test -z "$(manualendir)" || $(MKDIR_P) "$(DESTDIR)$(manualendir)"
+       @list='$(manualen_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualendir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualenDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualenDATA
++uninstall-am: uninstall-manualenDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualenDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualenDATA
++      uninstall uninstall-am uninstall-manualenDATA
+ claws-mail-manual.txt: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/dtd/Makefile.in claws-mail-3.5.0cvs114/manual/dtd/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/dtd/Makefile.in 2008-09-19 17:01:30.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/dtd/Makefile.in      2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,8 +51,6 @@ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -64,37 +58,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -106,8 +72,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -146,6 +110,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -177,12 +142,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -193,8 +157,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -204,8 +166,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -226,14 +186,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -245,6 +205,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -275,12 +236,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
+       manual.dsl  sdocbook.dtd
+@@ -322,10 +286,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+@@ -334,22 +294,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -394,7 +353,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -408,12 +367,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-am
+@@ -432,17 +399,20 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
+-      install-info install-info-am install-man install-strip \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
++      install-info install-info-am install-man install-pdf \
++      install-pdf-am install-ps install-ps-am install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+-      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+-      uninstall-info-am
++      mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/es/dist/html/Makefile.in claws-mail-3.5.0cvs114/manual/es/dist/html/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/es/dist/html/Makefile.in        2008-09-19 17:01:31.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/es/dist/html/Makefile.in     2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manuales_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.html
+ manuales_DATA = claws-mail-manual.html
+ manualesdir = $(manualdir)/es
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualesDATA: $(manuales_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualesdir)" || $(mkdir_p) "$(DESTDIR)$(manualesdir)"
++      test -z "$(manualesdir)" || $(MKDIR_P) "$(DESTDIR)$(manualesdir)"
+       @list='$(manuales_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualesdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualesDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualesDATA
++uninstall-am: uninstall-manualesDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualesDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualesDATA
++      uninstall uninstall-am uninstall-manualesDATA
+ claws-mail-manual.html: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/es/dist/Makefile.in claws-mail-3.5.0cvs114/manual/es/dist/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/es/dist/Makefile.in     2008-09-19 17:01:31.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/es/dist/Makefile.in  2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = html pdf ps txt
+ all: all-recursive
+@@ -330,10 +297,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -365,8 +328,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -410,8 +372,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -436,8 +398,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -447,13 +409,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -467,22 +428,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -496,7 +456,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -504,6 +464,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -543,8 +505,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -558,12 +519,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -582,22 +551,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/es/dist/pdf/Makefile.in claws-mail-3.5.0cvs114/manual/es/dist/pdf/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/es/dist/pdf/Makefile.in 2008-09-19 17:01:31.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/es/dist/pdf/Makefile.in      2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manuales_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.pdf
+ manuales_DATA = claws-mail-manual.pdf
+ manualesdir = $(manualdir)/es
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualesDATA: $(manuales_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualesdir)" || $(mkdir_p) "$(DESTDIR)$(manualesdir)"
++      test -z "$(manualesdir)" || $(MKDIR_P) "$(DESTDIR)$(manualesdir)"
+       @list='$(manuales_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualesdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualesDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualesDATA
++uninstall-am: uninstall-manualesDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualesDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualesDATA
++      uninstall uninstall-am uninstall-manualesDATA
+ claws-mail-manual.pdf: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/es/dist/ps/Makefile.in claws-mail-3.5.0cvs114/manual/es/dist/ps/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/es/dist/ps/Makefile.in  2008-09-19 17:01:31.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/es/dist/ps/Makefile.in       2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manuales_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.ps
+ manuales_DATA = claws-mail-manual.ps
+ manualesdir = $(manualdir)/es
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualesDATA: $(manuales_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualesdir)" || $(mkdir_p) "$(DESTDIR)$(manualesdir)"
++      test -z "$(manualesdir)" || $(MKDIR_P) "$(DESTDIR)$(manualesdir)"
+       @list='$(manuales_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualesdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualesDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualesDATA
++uninstall-am: uninstall-manualesDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualesDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualesDATA
++      uninstall uninstall-am uninstall-manualesDATA
+ claws-mail-manual.ps: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/es/dist/txt/Makefile.in claws-mail-3.5.0cvs114/manual/es/dist/txt/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/es/dist/txt/Makefile.in 2008-09-19 17:01:32.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/es/dist/txt/Makefile.in      2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manuales_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.txt
+ manuales_DATA = claws-mail-manual.txt
+ manualesdir = $(manualdir)/es
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualesDATA: $(manuales_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualesdir)" || $(mkdir_p) "$(DESTDIR)$(manualesdir)"
++      test -z "$(manualesdir)" || $(MKDIR_P) "$(DESTDIR)$(manualesdir)"
+       @list='$(manuales_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualesdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualesDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualesDATA
++uninstall-am: uninstall-manualesDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualesDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualesDATA
++      uninstall uninstall-am uninstall-manualesDATA
+ claws-mail-manual.txt: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/es/Makefile.in claws-mail-3.5.0cvs114/manual/es/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/es/Makefile.in  2008-09-19 17:01:31.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/es/Makefile.in       2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = dist
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @BUILD_MANUAL_TRUE@SUBDIRS = dist
+ EXTRA_DIST = \
+       account.xml \
+@@ -345,10 +312,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -380,8 +343,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -425,8 +387,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -451,8 +413,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -462,13 +424,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -482,22 +443,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -511,7 +471,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -519,6 +479,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -558,8 +520,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -573,12 +534,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -597,22 +566,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/fr/dist/html/Makefile.in claws-mail-3.5.0cvs114/manual/fr/dist/html/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/fr/dist/html/Makefile.in        2008-09-19 17:01:32.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/fr/dist/html/Makefile.in     2008-09-19 17:55:26.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualfr_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.html
+ manualfr_DATA = claws-mail-manual.html
+ manualfrdir = $(manualdir)/fr
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualfrDATA: $(manualfr_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualfrdir)" || $(mkdir_p) "$(DESTDIR)$(manualfrdir)"
++      test -z "$(manualfrdir)" || $(MKDIR_P) "$(DESTDIR)$(manualfrdir)"
+       @list='$(manualfr_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualfrdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualfrDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualfrDATA
++uninstall-am: uninstall-manualfrDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualfrDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualfrDATA
++      uninstall uninstall-am uninstall-manualfrDATA
+ claws-mail-manual.html: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/fr/dist/Makefile.in claws-mail-3.5.0cvs114/manual/fr/dist/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/fr/dist/Makefile.in     2008-09-19 17:01:32.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/fr/dist/Makefile.in  2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = html pdf ps txt
+ all: all-recursive
+@@ -330,10 +297,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -365,8 +328,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -410,8 +372,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -436,8 +398,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -447,13 +409,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -467,22 +428,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -496,7 +456,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -504,6 +464,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -543,8 +505,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -558,12 +519,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -582,22 +551,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/fr/dist/pdf/Makefile.in claws-mail-3.5.0cvs114/manual/fr/dist/pdf/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/fr/dist/pdf/Makefile.in 2008-09-19 17:01:33.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/fr/dist/pdf/Makefile.in      2008-09-19 17:55:26.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualfr_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.pdf
+ manualfr_DATA = claws-mail-manual.pdf
+ manualfrdir = $(manualdir)/fr
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualfrDATA: $(manualfr_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualfrdir)" || $(mkdir_p) "$(DESTDIR)$(manualfrdir)"
++      test -z "$(manualfrdir)" || $(MKDIR_P) "$(DESTDIR)$(manualfrdir)"
+       @list='$(manualfr_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualfrdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualfrDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualfrDATA
++uninstall-am: uninstall-manualfrDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualfrDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualfrDATA
++      uninstall uninstall-am uninstall-manualfrDATA
+ claws-mail-manual.pdf: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/fr/dist/ps/Makefile.in claws-mail-3.5.0cvs114/manual/fr/dist/ps/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/fr/dist/ps/Makefile.in  2008-09-19 17:01:33.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/fr/dist/ps/Makefile.in       2008-09-19 17:55:26.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualfr_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.ps
+ manualfr_DATA = claws-mail-manual.ps
+ manualfrdir = $(manualdir)/fr
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualfrDATA: $(manualfr_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualfrdir)" || $(mkdir_p) "$(DESTDIR)$(manualfrdir)"
++      test -z "$(manualfrdir)" || $(MKDIR_P) "$(DESTDIR)$(manualfrdir)"
+       @list='$(manualfr_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualfrdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualfrDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualfrDATA
++uninstall-am: uninstall-manualfrDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualfrDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualfrDATA
++      uninstall uninstall-am uninstall-manualfrDATA
+ claws-mail-manual.ps: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/fr/dist/txt/Makefile.in claws-mail-3.5.0cvs114/manual/fr/dist/txt/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/fr/dist/txt/Makefile.in 2008-09-19 17:01:33.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/fr/dist/txt/Makefile.in      2008-09-19 17:55:26.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualfr_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.txt
+ manualfr_DATA = claws-mail-manual.txt
+ manualfrdir = $(manualdir)/fr
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualfrDATA: $(manualfr_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualfrdir)" || $(mkdir_p) "$(DESTDIR)$(manualfrdir)"
++      test -z "$(manualfrdir)" || $(MKDIR_P) "$(DESTDIR)$(manualfrdir)"
+       @list='$(manualfr_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualfrdir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualfrDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualfrDATA
++uninstall-am: uninstall-manualfrDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualfrDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualfrDATA
++      uninstall uninstall-am uninstall-manualfrDATA
+ claws-mail-manual.txt: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/fr/Makefile.in claws-mail-3.5.0cvs114/manual/fr/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/fr/Makefile.in  2008-09-19 17:01:32.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/fr/Makefile.in       2008-09-19 17:55:25.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = dist
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @BUILD_MANUAL_TRUE@SUBDIRS = dist
+ EXTRA_DIST = \
+       account.xml \
+@@ -345,10 +312,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -380,8 +343,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -425,8 +387,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -451,8 +413,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -462,13 +424,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -482,22 +443,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -511,7 +471,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -519,6 +479,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -558,8 +520,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -573,12 +534,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -597,22 +566,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/Makefile.in claws-mail-3.5.0cvs114/manual/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/Makefile.in     2008-09-19 17:01:29.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/Makefile.in  2008-09-19 17:55:24.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = dtd dist es fr pl
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -202,8 +169,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -213,8 +178,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -235,14 +198,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -254,6 +217,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -284,12 +248,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @BUILD_MANUAL_TRUE@SUBDIRS = dtd dist es fr pl
+ EXTRA_DIST = \
+       account.xml \
+@@ -345,10 +312,6 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -380,8 +343,7 @@ $(RECURSIVE_TARGETS):
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+       @failcom='exit 1'; \
+       for f in x $$MAKEFLAGS; do \
+         case $$f in \
+@@ -425,8 +387,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       mkid -fID $$unique
+ tags: TAGS
+@@ -451,8 +413,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -462,13 +424,12 @@ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+-      here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+-        $(AWK) '    { files[$$0] = 1; } \
+-             END { for (i in files) print i; }'`; \
++        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++            END { if (nonempty) { for (i in files) print i; }; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+@@ -482,22 +443,21 @@ distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -511,7 +471,7 @@ distdir: $(DISTFILES)
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+         if test "$$subdir" = .; then :; else \
+           test -d "$(distdir)/$$subdir" \
+-          || $(mkdir_p) "$(distdir)/$$subdir" \
++          || $(MKDIR_P) "$(distdir)/$$subdir" \
+           || exit 1; \
+           distdir=`$(am__cd) $(distdir) && pwd`; \
+           top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -519,6 +479,8 @@ distdir: $(DISTFILES)
+             $(MAKE) $(AM_MAKEFLAGS) \
+               top_distdir="$$top_distdir" \
+               distdir="$$distdir/$$subdir" \
++              am__remove_distdir=: \
++              am__skip_length_check=: \
+               distdir) \
+             || exit 1; \
+         fi; \
+@@ -558,8 +520,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-recursive
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+-      distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+ dvi: dvi-recursive
+@@ -573,12 +534,20 @@ info-am:
+ install-data-am:
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+ install-man:
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+ maintainer-clean: maintainer-clean-recursive
+@@ -597,22 +566,24 @@ ps: ps-recursive
+ ps-am:
+-uninstall-am: uninstall-info-am
++uninstall-am:
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++      install-strip
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+-      clean clean-generic clean-libtool clean-recursive ctags \
+-      ctags-recursive distclean distclean-generic distclean-libtool \
+-      distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++      all all-am check check-am clean clean-generic clean-libtool \
++      ctags ctags-recursive distclean distclean-generic \
++      distclean-libtool distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+-      install-data-am install-exec install-exec-am install-info \
+-      install-info-am install-man install-strip installcheck \
++      install-data-am install-dvi install-dvi-am install-exec \
++      install-exec-am install-html install-html-am install-info \
++      install-info-am install-man install-pdf install-pdf-am \
++      install-ps install-ps-am install-strip installcheck \
+       installcheck-am installdirs installdirs-am maintainer-clean \
+-      maintainer-clean-generic maintainer-clean-recursive \
+-      mostlyclean mostlyclean-generic mostlyclean-libtool \
+-      mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+-      uninstall uninstall-am uninstall-info-am
++      maintainer-clean-generic mostlyclean mostlyclean-generic \
++      mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++      uninstall uninstall-am
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/pl/dist/html/Makefile.in claws-mail-3.5.0cvs114/manual/pl/dist/html/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/pl/dist/html/Makefile.in        2008-09-19 17:01:34.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/pl/dist/html/Makefile.in     2008-09-19 17:55:26.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,8 +61,6 @@ DATA = $(manualpl_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -74,37 +68,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -116,8 +82,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -156,6 +120,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -187,12 +152,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+@@ -203,8 +167,6 @@ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+ OPENSSL_LIBS = @OPENSSL_LIBS@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -214,8 +176,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PASSCRYPT_KEY = @PASSCRYPT_KEY@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ POSUB = @POSUB@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ RANLIB = @RANLIB@
+@@ -236,14 +196,14 @@ XGETTEXT_015 = @XGETTEXT_015@
+ XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -255,6 +215,7 @@ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -285,12 +246,15 @@ program_transform_name = @program_transf
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ EXTRA_DIST = claws-mail-manual.html
+ manualpl_DATA = claws-mail-manual.html
+ manualpldir = $(manualdir)/pl
+@@ -332,13 +296,9 @@ mostlyclean-libtool:
+ clean-libtool:
+       -rm -rf .libs _libs
+-
+-distclean-libtool:
+-      -rm -f libtool
+-uninstall-info-am:
+ install-manualplDATA: $(manualpl_DATA)
+       @$(NORMAL_INSTALL)
+-      test -z "$(manualpldir)" || $(mkdir_p) "$(DESTDIR)$(manualpldir)"
++      test -z "$(manualpldir)" || $(MKDIR_P) "$(DESTDIR)$(manualpldir)"
+       @list='$(manualpl_DATA)'; for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         f=$(am__strip_dir) \
+@@ -361,22 +321,21 @@ CTAGS:
+ distdir: $(DISTFILES)
+-      @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-      list='$(DISTFILES)'; for file in $$list; do \
+-        case $$file in \
+-          $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-          $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-        esac; \
++      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++      list='$(DISTFILES)'; \
++        dist_files=`for file in $$list; do echo $$file; done | \
++        sed -e "s|^$$srcdirstrip/||;t" \
++            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++      case $$dist_files in \
++        */*) $(MKDIR_P) `echo "$$dist_files" | \
++                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++                         sort -u` ;; \
++      esac; \
++      for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-        dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-        if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-          dir="/$$dir"; \
+-          $(mkdir_p) "$(distdir)$$dir"; \
+-        else \
+-          dir=''; \
+-        fi; \
+         if test -d $$d/$$file; then \
++          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+@@ -392,7 +351,7 @@ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+       for dir in "$(DESTDIR)$(manualpldir)"; do \
+-        test -z "$$dir" || $(mkdir_p) "$$dir"; \
++        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+ install: install-am
+ install-exec: install-exec-am
+@@ -424,7 +383,7 @@ clean-am: clean-generic clean-libtool mo
+ distclean: distclean-am
+       -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+ dvi: dvi-am
+@@ -438,12 +397,20 @@ info-am:
+ install-data-am: install-manualplDATA
++install-dvi: install-dvi-am
++
+ install-exec-am:
++install-html: install-html-am
++
+ install-info: install-info-am
+ install-man:
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+@@ -460,18 +427,21 @@ ps: ps-am
+ ps-am:
+-uninstall-am: uninstall-info-am uninstall-manualplDATA
++uninstall-am: uninstall-manualplDATA
++
++.MAKE: install-am install-strip
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+-      install-data install-data-am install-exec install-exec-am \
++      install-data install-data-am install-dvi install-dvi-am \
++      install-exec install-exec-am install-html install-html-am \
+       install-info install-info-am install-man install-manualplDATA \
++      install-pdf install-pdf-am install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-      uninstall uninstall-am uninstall-info-am \
+-      uninstall-manualplDATA
++      uninstall uninstall-am uninstall-manualplDATA
+ claws-mail-manual.html: \
+diff -rupN claws-mail-3.5.0cvs114-auto/manual/pl/dist/Makefile.in claws-mail-3.5.0cvs114/manual/pl/dist/Makefile.in
+--- claws-mail-3.5.0cvs114-auto/manual/pl/dist/Makefile.in     2008-09-19 17:01:33.000000000 +0200
++++ claws-mail-3.5.0cvs114/manual/pl/dist/Makefile.in  2008-09-19 17:55:26.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
+ # @configure_input@
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -54,18 +50,19 @@ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+       html-recursive info-recursive install-data-recursive \
+-      install-exec-recursive install-info-recursive \
+-      install-recursive installcheck-recursive installdirs-recursive \
+-      pdf-recursive ps-recursive uninstall-info-recursive \
+-      uninstall-recursive
++      install-dvi-recursive install-exec-recursive \
++      install-html-recursive install-info-recursive \
++      install-pdf-recursive install-ps-recursive install-recursive \
++      installcheck-recursive installdirs-recursive pdf-recursive \
++      ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive       \
++  distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALLOCA = @ALLOCA@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AS = @AS@
+@@ -73,37 +70,9 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+-BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+-BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+-BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+-BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+-BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+-BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+-BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+-BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+-BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+-BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+-BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+-BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+-BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+-BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+-BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+-BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+-BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+-BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+-CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+-CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+-CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+-CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+-CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+-CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+-CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+-CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
+-CLAWS_VALGRIND_FALSE = @CLAWS_VALGRIND_FALSE@
+-CLAWS_VALGRIND_TRUE = @CLAWS_VALGRIND_TRUE@
+ COMPFACE_LIBS = @COMPFACE_LIBS@
+ CONIC_CFLAGS = @CONIC_CFLAGS@
+ CONIC_LIBS = @CONIC_LIBS@
+@@ -115,8 +84,6 @@ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+-CYGWIN_FALSE = @CYGWIN_FALSE@
+-CYGWIN_TRUE = @CYGWIN_TRUE@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+@@ -155,6 +122,7 @@ GTK210_CFLAGS = @GTK210_CFLAGS@
+ GTK210_LIBS = @GTK210_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -186,12 +154,11 @@ LT_REVISION = @LT_REVISION@
+ MAEMO_CFLAGS = @MAEMO_CFLAGS@
+ MAEMO_LIBS = @MAEMO_LIBS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAJOR_VERSION = @MAJOR_VERSION@
+ MAKEINFO = @MAKEINFO@
+ MICRO_VERSION = @MICRO_VERSION@
+ MINOR_VERSION = @MINOR_VERSION@
++MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@