diff -u claws-mail-3.3.0/debian/patches/clam-mail.1.patch claws-mail-3.3.0/debian/patches/clam-mail.1.patch
--- claws-mail-3.3.0/debian/patches/clam-mail.1.patch
+++ claws-mail-3.3.0/debian/patches/clam-mail.1.patch
@@ -1,5 +1,7 @@
---- claws-mail-3.3.0.orig/doc/man/claws-mail.1
-+++ claws-mail-3.3.0/doc/man/claws-mail.1
+Index: claws-mail-3.3.0/doc/man/claws-mail.1
+===================================================================
+--- claws-mail-3.3.0.orig/doc/man/claws-mail.1	2008-02-08 03:33:14.000000000 -0200
++++ claws-mail-3.3.0/doc/man/claws-mail.1	2008-03-11 10:37:20.000000000 -0300
 @@ -1,8 +1,7 @@
  .TH "Claws Mail" "1" "December 18, 2007" "Hiroyuki Yamamoto & the Claws Mail team"
  
diff -u claws-mail-3.3.0/debian/patches/series claws-mail-3.3.0/debian/patches/series
--- claws-mail-3.3.0/debian/patches/series
+++ claws-mail-3.3.0/debian/patches/series
@@ -4,0 +5,3 @@
+20hildoninterface.patch
+21configure.ac.patch
+22hildonautoconf.patch
diff -u claws-mail-3.3.0/debian/changelog claws-mail-3.3.0/debian/changelog
--- claws-mail-3.3.0/debian/changelog
+++ claws-mail-3.3.0/debian/changelog
@@ -1,3 +1,17 @@
+claws-mail (3.3.0-1ubuntu5) hardy; urgency=low
+
+  * debian/rules
+    - Added --enable-maemo flag to enable the hildon interface and
+      small screen changes if claws-mail is built for lpia. (LP: #198861)
+  * debian/control
+    - Added lpia dependencies.
+  * configure.ac
+    - Added new flag to test when the build is for UME and not Maemo.
+  * Added extra UME flag to allow conditional compilation when building for
+    UME, disabling parts of Hildon not used such as tap-and-hold.
+
+ -- Adilson Oliveira <adilson@ubuntu.com>  Wed, 11 Mar 2008 17:17:00 -0300
+
 claws-mail (3.3.0-1ubuntu4) hardy; urgency=low
 
   * Upstream dropped claws-mail-clamav, so the sylpheed-claws-gtk2-clamav
diff -u claws-mail-3.3.0/debian/rules claws-mail-3.3.0/debian/rules
--- claws-mail-3.3.0/debian/rules
+++ claws-mail-3.3.0/debian/rules
@@ -7,6 +7,10 @@
 
 CFLAGS = -Wall -g
 
+ifeq ($(DEB_BUILD_ARCH), lpia)
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-maemo
+endif
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -32,7 +36,8 @@
 		--enable-jpilot \
 		--enable-ldap \
 		--enable-spamassassin-plugin=yes \
-		--with-config-dir=.claws-mail
+		--with-config-dir=.claws-mail \
+		$(DEB_CONFIGURE_EXTRA_FLAGS)
 
 build: build-stamp
 
diff -u claws-mail-3.3.0/debian/control claws-mail-3.3.0/debian/control
--- claws-mail-3.3.0/debian/control
+++ claws-mail-3.3.0/debian/control
@@ -9,7 +9,8 @@
  libssl-dev, aspell-bin, libpisock-dev, libldap2-dev, network-manager-dev,
  flex | flex-old, bison, gettext, libltdl3-dev, autotools-dev, libtool, 
  libaspell-dev (>= 0.50.3), libreadline5-dev, libt1-dev, 
- libgnomeprintui2.2-dev, libetpan-dev (>= 0.52)
+ libgnomeprintui2.2-dev, libetpan-dev (>= 0.52), libhildon-1-dev [lpia], libosso-dev [lpia], 
+ libhildonfm2-dev [lpia], libgnomevfs2-dev [lpia], libhal-dev [lpia]
 Standards-Version: 3.7.3
 
 Package: claws-mail
only in patch2:
unchanged:
--- claws-mail-3.3.0.orig/debian/patches/20hildoninterface.patch
+++ claws-mail-3.3.0/debian/patches/20hildoninterface.patch
@@ -0,0 +1,281 @@
+Index: claws-mail-3.3.0/src/action.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/action.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/action.c	2008-03-11 14:09:26.000000000 -0300
+@@ -1290,7 +1290,7 @@
+ 		gtk_box_pack_start(GTK_BOX(input_hbox), entry, TRUE, TRUE, 0);
+ 		if (children->action_type & ACTION_USER_HIDDEN_IN) {
+ 			gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 			hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), 
+ 				HILDON_GTK_INPUT_MODE_FULL | 
+ 				HILDON_GTK_INPUT_MODE_INVISIBLE);
+Index: claws-mail-3.3.0/src/addrcustomattr.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/addrcustomattr.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/addrcustomattr.c	2008-03-11 14:09:26.000000000 -0300
+@@ -275,7 +275,7 @@
+ 	/* create the columns */
+ 	custom_attr_window_create_list_view_columns(GTK_WIDGET(list_view));
+ 
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(list_view), "popup-menu",
+ 			 G_CALLBACK(custom_attr_list_popup_menu), list_view);
+ #else
+Index: claws-mail-3.3.0/src/common/utils.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/common/utils.c	2008-03-11 14:09:26.000000000 -0300
++++ claws-mail-3.3.0/src/common/utils.c	2008-03-11 14:09:26.000000000 -0300
+@@ -62,12 +62,14 @@
+ 
+ #ifdef MAEMO
+ #include <libosso.h>
++#ifndef UME
+ #ifdef CHINOOK
+ # include <tablet-browser-interface.h>
+ #else
+ # include <osso-browser-interface.h>
+ #endif
+ #endif
++#endif
+ 
+ #include "utils.h"
+ #include "socket.h"
+@@ -3223,7 +3225,7 @@
+ 
+ 	return child_stdout;
+ }
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ static gint is_unchanged_uri_char(char c)
+ {
+ 	switch (c) {
+@@ -3262,7 +3264,7 @@
+ #endif
+ gint open_uri(const gchar *uri, const gchar *cmdline)
+ {
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	gchar buf[BUFFSIZE];
+ 	gchar *p;
+ 	gchar encoded_uri[BUFFSIZE];
+Index: claws-mail-3.3.0/src/compose.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/compose.c	2008-03-11 14:09:26.000000000 -0300
++++ claws-mail-3.3.0/src/compose.c	2008-03-11 14:09:26.000000000 -0300
+@@ -6314,7 +6314,7 @@
+ 			 G_CALLBACK(attach_selected), compose);
+ 	g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
+ 			 G_CALLBACK(attach_button_pressed), compose);
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(attach_clist), "popup-menu",
+ 			 G_CALLBACK(popup_attach_button_pressed), compose);
+ #else
+@@ -6766,7 +6766,7 @@
+ 			 G_CALLBACK(text_inserted), compose);
+ 	g_signal_connect(G_OBJECT(text), "button_press_event",
+ 			 G_CALLBACK(text_clicked), compose);
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(text), "popup-menu",
+ 			 G_CALLBACK(compose_popup_menu), compose);
+ #else
+Index: claws-mail-3.3.0/src/editaddress.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/editaddress.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/editaddress.c	2008-03-11 14:09:26.000000000 -0300
+@@ -923,7 +923,7 @@
+ 		GTK_NOTEBOOK( personeditdlg.notebook ),
+ 		gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label );
+ 	
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(ebox_picture), "popup-menu",
+ 			 G_CALLBACK(addressbook_edit_person_picture_popup_menu), NULL);
+ #else
+Index: claws-mail-3.3.0/src/editldap.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/editldap.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/editldap.c	2008-03-11 14:09:26.000000000 -0300
+@@ -756,7 +756,7 @@
+ 	gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1),
+ 		GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+ 	gtk_entry_set_visibility(GTK_ENTRY(entry_bindPW), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry_bindPW), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+Index: claws-mail-3.3.0/src/edittags.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/edittags.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/edittags.c	2008-03-11 14:09:26.000000000 -0300
+@@ -335,7 +335,7 @@
+ 	/* create the columns */
+ 	apply_window_create_list_view_columns(GTK_WIDGET(list_view));
+ 
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(list_view), "popup-menu",
+ 			 G_CALLBACK(apply_list_popup_menu), list_view);
+ #else
+Index: claws-mail-3.3.0/src/folderview.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/folderview.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/folderview.c	2008-03-11 14:09:26.000000000 -0300
+@@ -544,7 +544,7 @@
+ 	g_signal_connect(G_OBJECT(ctree), "button_press_event",
+ 			 G_CALLBACK(folderview_button_pressed),
+ 			 folderview);
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(ctree), "popup-menu",
+ 			 G_CALLBACK(folderview_popup_menu), folderview);
+ #else
+Index: claws-mail-3.3.0/src/gtk/inputdialog.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/gtk/inputdialog.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/gtk/inputdialog.c	2008-03-11 14:09:26.000000000 -0300
+@@ -111,7 +111,7 @@
+ 	gtk_widget_hide(icon_p);
+ 	is_pass = FALSE;
+ 	gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
+ #endif
+@@ -136,7 +136,7 @@
+ 	gtk_widget_show(icon_p);
+ 	is_pass = TRUE;
+ 	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+Index: claws-mail-3.3.0/src/mimeview.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/mimeview.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/mimeview.c	2008-03-11 14:09:26.000000000 -0300
+@@ -2235,7 +2235,7 @@
+ 	gtk_widget_show_all(button);
+ 	gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
+ 			    mimeview_mime_types, 1, GDK_ACTION_COPY);
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(button), "popup-menu",
+ 			 G_CALLBACK(icon_popup_menu), mimeview);
+ #else
+Index: claws-mail-3.3.0/src/plugins/pgpcore/passphrase.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/plugins/pgpcore/passphrase.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/plugins/pgpcore/passphrase.c	2008-03-11 14:09:26.000000000 -0300
+@@ -127,7 +127,7 @@
+     pass_entry = gtk_entry_new();
+     gtk_box_pack_start(GTK_BOX(vbox), pass_entry, FALSE, FALSE, 0);
+     gtk_entry_set_visibility(GTK_ENTRY(pass_entry), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+     hildon_gtk_entry_set_input_mode(GTK_ENTRY(pass_entry), 
+     	HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+Index: claws-mail-3.3.0/src/prefs_account.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/prefs_account.c	2008-03-11 14:09:26.000000000 -0300
++++ claws-mail-3.3.0/src/prefs_account.c	2008-03-11 14:09:26.000000000 -0300
+@@ -1137,7 +1137,7 @@
+ 			  GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0);
+ #endif
+ 	gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(pass_entry), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+@@ -1718,7 +1718,7 @@
+ 	gtk_box_pack_start (GTK_BOX (hbox), smtp_pass_entry, TRUE, TRUE, 0);
+ 
+ 	gtk_entry_set_visibility (GTK_ENTRY (smtp_pass_entry), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(smtp_pass_entry), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+Index: claws-mail-3.3.0/src/prefs_actions.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/prefs_actions.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/prefs_actions.c	2008-03-11 14:09:26.000000000 -0300
+@@ -1088,7 +1088,7 @@
+ 	list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+ 	g_object_unref(model);	
+ 	
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(list_view), "popup-menu",
+ 			 G_CALLBACK(prefs_actions_list_popup_menu), list_view);
+ #else
+Index: claws-mail-3.3.0/src/prefs_filtering.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/prefs_filtering.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/prefs_filtering.c	2008-03-11 14:09:26.000000000 -0300
+@@ -1814,7 +1814,7 @@
+ 	g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL);
+ #endif
+ 
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(list_view), "popup-menu",
+ 			 G_CALLBACK(prefs_filtering_list_popup_menu), list_view);
+ #else
+Index: claws-mail-3.3.0/src/prefs_template.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/prefs_template.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/prefs_template.c	2008-03-11 14:09:26.000000000 -0300
+@@ -1072,7 +1072,7 @@
+ 	list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+ 	g_object_unref(model);	
+ 
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(list_view), "popup-menu",
+ 			 G_CALLBACK(prefs_template_list_popup_menu), list_view);
+ #else
+Index: claws-mail-3.3.0/src/summaryview.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/summaryview.c	2008-03-11 14:09:26.000000000 -0300
++++ claws-mail-3.3.0/src/summaryview.c	2008-03-11 14:09:26.000000000 -0300
+@@ -5995,7 +5995,7 @@
+ 	g_signal_connect(G_OBJECT(ctree), "button_press_event",
+ 			 G_CALLBACK(summary_button_pressed),
+ 			 summaryview);
+-#ifndef MAEMO
++#if (!defined MAEMO) || (defined UME)
+ 	g_signal_connect(G_OBJECT(ctree), "popup-menu",
+ 			 G_CALLBACK(summary_popup_menu), summaryview);
+ #else
+Index: claws-mail-3.3.0/src/wizard.c
+===================================================================
+--- claws-mail-3.3.0.orig/src/wizard.c	2008-03-11 11:13:49.000000000 -0300
++++ claws-mail-3.3.0/src/wizard.c	2008-03-11 14:09:26.000000000 -0300
+@@ -1230,7 +1230,7 @@
+ 	wizard->smtp_password = gtk_entry_new();
+ 	gtk_entry_set_text(GTK_ENTRY(wizard->smtp_password), tmpl.smtppass?tmpl.smtppass:""); 
+ 	gtk_entry_set_visibility(GTK_ENTRY(wizard->smtp_password), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->smtp_password), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+@@ -1456,7 +1456,7 @@
+ 	if (GTK_IS_MISC(wizard->recv_password_label))						      
+ 		gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5);	      
+ 	gtk_entry_set_visibility(GTK_ENTRY(wizard->recv_password), FALSE);
+-#ifdef MAEMO
++#if (defined MAEMO) && (!defined UME)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->recv_password), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
only in patch2:
unchanged:
--- claws-mail-3.3.0.orig/debian/patches/21configure.ac.patch
+++ claws-mail-3.3.0/debian/patches/21configure.ac.patch
@@ -0,0 +1,30 @@
+--- claws-mail-3.3.0/configure.ac	2008-03-11 14:11:00.000000000 -0300
++++ claws-mail-3.3.0.new/configure.ac	2008-03-10 21:19:43.000000000 -0300
+@@ -502,11 +502,19 @@
+ 		else
+ 			AC_DEFINE(MAEMO, 1, Build for maemo)
+ 			AC_DEFINE(CHINOOK, 1, Maemo chinook)
++			#test for ume
++			PKG_CHECK_MODULES(MAEMO, dbus-1, ac_cv_enable_ume=yes, ac_cv_enable_ume=no)
++			if test $ac_cv_enable_ume = no; then
++			    AC_MSG_ERROR(dbus-1 not found)
++			else
++			    AC_DEFINE(UME, 1, Build for maemo)
++			fi
+ 		fi
+ 	else
+ 		AC_DEFINE(MAEMO, 1, Build for maemo)
+ 	fi
+ fi
++
+ PKG_CHECK_MODULES(CONIC, conic, ac_cv_enable_conic=yes,
+ 	  ac_cv_enable_conic=no)
+ AC_SUBST(CONIC_CFLAGS)
+@@ -1034,6 +1042,7 @@
+ echo "Manual            : $ac_cv_enable_manual"
+ echo "Plugins           : $PLUGINS"
+ echo "Maemo  build      : $ac_cv_enable_maemo"
++echo "UME  build        : $ac_cv_enable_ume"
+ echo "Config dir        : $ac_cv_with_config_dir"
+ echo ""
+ echo "The binary will be installed in $prefix/bin"
only in patch2:
unchanged:
--- claws-mail-3.3.0.orig/debian/patches/22hildonautoconf.patch
+++ claws-mail-3.3.0/debian/patches/22hildonautoconf.patch
@@ -0,0 +1,814 @@
+diff -urN claws-mail-3.3.0.old/config/Makefile.in claws-mail-3.3.0/config/Makefile.in
+--- claws-mail-3.3.0.old/config/Makefile.in	2008-02-08 05:40:51.000000000 -0200
++++ claws-mail-3.3.0/config/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -261,9 +261,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  config/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  config/Makefile
++	  $(AUTOMAKE) --gnu  config/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/config.h.in claws-mail-3.3.0/config.h.in
+--- claws-mail-3.3.0.old/config.h.in	2008-02-08 05:40:41.000000000 -0200
++++ claws-mail-3.3.0/config.h.in	2008-03-11 16:23:56.000000000 -0300
+@@ -375,6 +375,9 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+ 
++/* Build for maemo */
++#undef UME
++
+ /* Define if you use ASPELL to support spell checking */
+ #undef USE_ASPELL
+ 
+diff -urN claws-mail-3.3.0.old/configure claws-mail-3.3.0/configure
+--- claws-mail-3.3.0.old/configure	2008-02-08 05:40:52.000000000 -0200
++++ claws-mail-3.3.0/configure	2008-03-11 16:24:02.000000000 -0300
+@@ -29162,6 +29162,89 @@
+ #define CHINOOK 1
+ _ACEOF
+ 
++			#test for ume
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for MAEMO" >&5
++echo $ECHO_N "checking for MAEMO... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$MAEMO_CFLAGS"; then
++        pkg_cv_MAEMO_CFLAGS="$MAEMO_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
++  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_MAEMO_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$MAEMO_LIBS"; then
++        pkg_cv_MAEMO_LIBS="$MAEMO_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-1\"") >&5
++  ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_MAEMO_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        MAEMO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1"`
++        else
++	        MAEMO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$MAEMO_PKG_ERRORS" >&5
++
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                ac_cv_enable_ume=no
++elif test $pkg_failed = untried; then
++	ac_cv_enable_ume=no
++else
++	MAEMO_CFLAGS=$pkg_cv_MAEMO_CFLAGS
++	MAEMO_LIBS=$pkg_cv_MAEMO_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	ac_cv_enable_ume=yes
++fi
++			if test $ac_cv_enable_ume = no; then
++			    { { echo "$as_me:$LINENO: error: dbus-1 not found" >&5
++echo "$as_me: error: dbus-1 not found" >&2;}
++   { (exit 1); exit 1; }; }
++			else
++
++cat >>confdefs.h <<\_ACEOF
++#define UME 1
++_ACEOF
++
++			fi
+ 		fi
+ 	else
+ 
+@@ -29172,6 +29255,7 @@
+ 	fi
+ fi
+ 
++
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for CONIC" >&5
+ echo $ECHO_N "checking for CONIC... $ECHO_C" >&6; }
+@@ -34859,6 +34943,7 @@
+ echo "Manual            : $ac_cv_enable_manual"
+ echo "Plugins           : $PLUGINS"
+ echo "Maemo  build      : $ac_cv_enable_maemo"
++echo "UME  build        : $ac_cv_enable_ume"
+ echo "Config dir        : $ac_cv_with_config_dir"
+ echo ""
+ echo "The binary will be installed in $prefix/bin"
+diff -urN claws-mail-3.3.0.old/doc/Makefile.in claws-mail-3.3.0/doc/Makefile.in
+--- claws-mail-3.3.0.old/doc/Makefile.in	2008-02-08 05:40:43.000000000 -0200
++++ claws-mail-3.3.0/doc/Makefile.in	2008-03-11 16:24:05.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/Makefile
++	  $(AUTOMAKE) --gnu  doc/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/doc/man/Makefile.in claws-mail-3.3.0/doc/man/Makefile.in
+--- claws-mail-3.3.0.old/doc/man/Makefile.in	2008-02-08 05:40:43.000000000 -0200
++++ claws-mail-3.3.0/doc/man/Makefile.in	2008-03-11 16:24:05.000000000 -0300
+@@ -267,9 +267,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/man/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/man/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  doc/man/Makefile
++	  $(AUTOMAKE) --gnu  doc/man/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/m4/Makefile.in claws-mail-3.3.0/m4/Makefile.in
+--- claws-mail-3.3.0.old/m4/Makefile.in	2008-02-08 05:40:43.000000000 -0200
++++ claws-mail-3.3.0/m4/Makefile.in	2008-03-11 16:24:05.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  m4/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  m4/Makefile
++	  $(AUTOMAKE) --gnu  m4/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/Makefile.in claws-mail-3.3.0/Makefile.in
+--- claws-mail-3.3.0.old/Makefile.in	2008-02-08 05:40:43.000000000 -0200
++++ claws-mail-3.3.0/Makefile.in	2008-03-11 16:24:05.000000000 -0300
+@@ -39,7 +39,7 @@
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/claws-mail.pc.in $(srcdir)/config.h.in \
+ 	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+-	INSTALL NEWS TODO
++	INSTALL NEWS TODO config.guess config.sub
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal-include.m4 \
+ 	$(top_srcdir)/m4/aspell.m4 $(top_srcdir)/m4/check-type.m4 \
+@@ -337,15 +337,15 @@
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+ 	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
++	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+ 		&& exit 0; \
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  Makefile
++	  $(AUTOMAKE) --gnu  Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/dist/html/Makefile.in claws-mail-3.3.0/manual/dist/html/Makefile.in
+--- claws-mail-3.3.0.old/manual/dist/html/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/dist/html/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/dist/html/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/dist/html/Makefile
++	  $(AUTOMAKE) --gnu  manual/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/dist/Makefile.in claws-mail-3.3.0/manual/dist/Makefile.in
+--- claws-mail-3.3.0.old/manual/dist/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/dist/Makefile.in	2008-03-11 16:24:05.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/dist/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/dist/Makefile
++	  $(AUTOMAKE) --gnu  manual/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/dist/pdf/Makefile.in claws-mail-3.3.0/manual/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.old/manual/dist/pdf/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/dist/pdf/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/dist/pdf/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu  manual/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/dist/ps/Makefile.in claws-mail-3.3.0/manual/dist/ps/Makefile.in
+--- claws-mail-3.3.0.old/manual/dist/ps/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/dist/ps/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/dist/ps/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu  manual/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/dist/txt/Makefile.in claws-mail-3.3.0/manual/dist/txt/Makefile.in
+--- claws-mail-3.3.0.old/manual/dist/txt/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/dist/txt/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/dist/txt/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu  manual/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/dtd/Makefile.in claws-mail-3.3.0/manual/dtd/Makefile.in
+--- claws-mail-3.3.0.old/manual/dtd/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/dtd/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -262,9 +262,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/dtd/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/dtd/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/dtd/Makefile
++	  $(AUTOMAKE) --gnu  manual/dtd/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/es/dist/html/Makefile.in claws-mail-3.3.0/manual/es/dist/html/Makefile.in
+--- claws-mail-3.3.0.old/manual/es/dist/html/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/es/dist/html/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/es/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/es/dist/html/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/es/dist/html/Makefile
++	  $(AUTOMAKE) --gnu  manual/es/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/es/dist/Makefile.in claws-mail-3.3.0/manual/es/dist/Makefile.in
+--- claws-mail-3.3.0.old/manual/es/dist/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/es/dist/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/es/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/es/dist/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/es/dist/Makefile
++	  $(AUTOMAKE) --gnu  manual/es/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/es/dist/pdf/Makefile.in claws-mail-3.3.0/manual/es/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.old/manual/es/dist/pdf/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/es/dist/pdf/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/es/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/es/dist/pdf/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/es/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu  manual/es/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/es/dist/ps/Makefile.in claws-mail-3.3.0/manual/es/dist/ps/Makefile.in
+--- claws-mail-3.3.0.old/manual/es/dist/ps/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/es/dist/ps/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/es/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/es/dist/ps/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/es/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu  manual/es/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/es/dist/txt/Makefile.in claws-mail-3.3.0/manual/es/dist/txt/Makefile.in
+--- claws-mail-3.3.0.old/manual/es/dist/txt/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/es/dist/txt/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/es/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/es/dist/txt/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/es/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu  manual/es/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/es/Makefile.in claws-mail-3.3.0/manual/es/Makefile.in
+--- claws-mail-3.3.0.old/manual/es/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/es/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -287,9 +287,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/es/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/es/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/es/Makefile
++	  $(AUTOMAKE) --gnu  manual/es/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/fr/dist/html/Makefile.in claws-mail-3.3.0/manual/fr/dist/html/Makefile.in
+--- claws-mail-3.3.0.old/manual/fr/dist/html/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/fr/dist/html/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/fr/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/fr/dist/html/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/fr/dist/html/Makefile
++	  $(AUTOMAKE) --gnu  manual/fr/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/fr/dist/Makefile.in claws-mail-3.3.0/manual/fr/dist/Makefile.in
+--- claws-mail-3.3.0.old/manual/fr/dist/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/fr/dist/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/fr/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/fr/dist/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/fr/dist/Makefile
++	  $(AUTOMAKE) --gnu  manual/fr/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/fr/dist/pdf/Makefile.in claws-mail-3.3.0/manual/fr/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.old/manual/fr/dist/pdf/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/fr/dist/pdf/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/fr/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/fr/dist/pdf/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/fr/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu  manual/fr/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/fr/dist/ps/Makefile.in claws-mail-3.3.0/manual/fr/dist/ps/Makefile.in
+--- claws-mail-3.3.0.old/manual/fr/dist/ps/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/fr/dist/ps/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/fr/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/fr/dist/ps/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/fr/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu  manual/fr/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/fr/dist/txt/Makefile.in claws-mail-3.3.0/manual/fr/dist/txt/Makefile.in
+--- claws-mail-3.3.0.old/manual/fr/dist/txt/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/fr/dist/txt/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/fr/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/fr/dist/txt/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/fr/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu  manual/fr/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/fr/Makefile.in claws-mail-3.3.0/manual/fr/Makefile.in
+--- claws-mail-3.3.0.old/manual/fr/Makefile.in	2008-02-08 05:40:45.000000000 -0200
++++ claws-mail-3.3.0/manual/fr/Makefile.in	2008-03-11 16:24:06.000000000 -0300
+@@ -287,9 +287,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/fr/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/fr/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/fr/Makefile
++	  $(AUTOMAKE) --gnu  manual/fr/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/Makefile.in claws-mail-3.3.0/manual/Makefile.in
+--- claws-mail-3.3.0.old/manual/Makefile.in	2008-02-08 05:40:44.000000000 -0200
++++ claws-mail-3.3.0/manual/Makefile.in	2008-03-11 16:24:05.000000000 -0300
+@@ -287,9 +287,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/Makefile
++	  $(AUTOMAKE) --gnu  manual/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/pl/dist/html/Makefile.in claws-mail-3.3.0/manual/pl/dist/html/Makefile.in
+--- claws-mail-3.3.0.old/manual/pl/dist/html/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/pl/dist/html/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/pl/dist/html/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/pl/dist/html/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/pl/dist/html/Makefile
++	  $(AUTOMAKE) --gnu  manual/pl/dist/html/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/pl/dist/Makefile.in claws-mail-3.3.0/manual/pl/dist/Makefile.in
+--- claws-mail-3.3.0.old/manual/pl/dist/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/pl/dist/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/pl/dist/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/pl/dist/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/pl/dist/Makefile
++	  $(AUTOMAKE) --gnu  manual/pl/dist/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/pl/dist/pdf/Makefile.in claws-mail-3.3.0/manual/pl/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.old/manual/pl/dist/pdf/Makefile.in	2008-02-08 05:40:47.000000000 -0200
++++ claws-mail-3.3.0/manual/pl/dist/pdf/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/pl/dist/pdf/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/pl/dist/pdf/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/pl/dist/pdf/Makefile
++	  $(AUTOMAKE) --gnu  manual/pl/dist/pdf/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/pl/dist/ps/Makefile.in claws-mail-3.3.0/manual/pl/dist/ps/Makefile.in
+--- claws-mail-3.3.0.old/manual/pl/dist/ps/Makefile.in	2008-02-08 05:40:47.000000000 -0200
++++ claws-mail-3.3.0/manual/pl/dist/ps/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/pl/dist/ps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/pl/dist/ps/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/pl/dist/ps/Makefile
++	  $(AUTOMAKE) --gnu  manual/pl/dist/ps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/pl/dist/txt/Makefile.in claws-mail-3.3.0/manual/pl/dist/txt/Makefile.in
+--- claws-mail-3.3.0.old/manual/pl/dist/txt/Makefile.in	2008-02-08 05:40:47.000000000 -0200
++++ claws-mail-3.3.0/manual/pl/dist/txt/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -272,9 +272,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/pl/dist/txt/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/pl/dist/txt/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/pl/dist/txt/Makefile
++	  $(AUTOMAKE) --gnu  manual/pl/dist/txt/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/manual/pl/Makefile.in claws-mail-3.3.0/manual/pl/Makefile.in
+--- claws-mail-3.3.0.old/manual/pl/Makefile.in	2008-02-08 05:40:46.000000000 -0200
++++ claws-mail-3.3.0/manual/pl/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -287,9 +287,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  manual/pl/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  manual/pl/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  manual/pl/Makefile
++	  $(AUTOMAKE) --gnu  manual/pl/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/common/Makefile.in claws-mail-3.3.0/src/common/Makefile.in
+--- claws-mail-3.3.0.old/src/common/Makefile.in	2008-02-08 05:40:48.000000000 -0200
++++ claws-mail-3.3.0/src/common/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -403,9 +403,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/common/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/common/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/common/Makefile
++	  $(AUTOMAKE) --gnu  src/common/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/etpan/Makefile.in claws-mail-3.3.0/src/etpan/Makefile.in
+--- claws-mail-3.3.0.old/src/etpan/Makefile.in	2008-02-08 05:40:49.000000000 -0200
++++ claws-mail-3.3.0/src/etpan/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -325,9 +325,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/etpan/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/etpan/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/etpan/Makefile
++	  $(AUTOMAKE) --gnu  src/etpan/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/gtk/Makefile.in claws-mail-3.3.0/src/gtk/Makefile.in
+--- claws-mail-3.3.0.old/src/gtk/Makefile.in	2008-02-08 05:40:49.000000000 -0200
++++ claws-mail-3.3.0/src/gtk/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -385,9 +385,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gtk/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gtk/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/gtk/Makefile
++	  $(AUTOMAKE) --gnu  src/gtk/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/Makefile.in claws-mail-3.3.0/src/Makefile.in
+--- claws-mail-3.3.0.old/src/Makefile.in	2008-02-08 05:40:48.000000000 -0200
++++ claws-mail-3.3.0/src/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -907,9 +907,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/Makefile
++	  $(AUTOMAKE) --gnu  src/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/bogofilter/Makefile.in claws-mail-3.3.0/src/plugins/bogofilter/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/bogofilter/Makefile.in	2008-02-08 05:40:49.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/bogofilter/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -321,9 +321,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/bogofilter/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/bogofilter/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/bogofilter/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/bogofilter/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/demo/Makefile.in claws-mail-3.3.0/src/plugins/demo/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/demo/Makefile.in	2008-02-08 05:40:49.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/demo/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -311,9 +311,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/demo/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/demo/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/demo/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/demo/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/dillo_viewer/Makefile.in claws-mail-3.3.0/src/plugins/dillo_viewer/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/dillo_viewer/Makefile.in	2008-02-08 05:40:49.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/dillo_viewer/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -319,9 +319,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/dillo_viewer/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/dillo_viewer/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/dillo_viewer/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/dillo_viewer/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/Makefile.in claws-mail-3.3.0/src/plugins/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/Makefile.in	2008-02-08 05:40:49.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/Makefile.in	2008-03-11 16:24:07.000000000 -0300
+@@ -289,9 +289,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/pgpcore/Makefile.in claws-mail-3.3.0/src/plugins/pgpcore/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/pgpcore/Makefile.in	2008-02-08 05:40:50.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/pgpcore/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -359,9 +359,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/pgpcore/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/pgpcore/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/pgpcore/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/pgpcore/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/pgpinline/Makefile.in claws-mail-3.3.0/src/plugins/pgpinline/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/pgpinline/Makefile.in	2008-02-08 05:40:50.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/pgpinline/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -356,9 +356,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/pgpinline/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/pgpinline/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/pgpinline/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/pgpinline/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/pgpmime/Makefile.in claws-mail-3.3.0/src/plugins/pgpmime/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/pgpmime/Makefile.in	2008-02-08 05:40:50.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/pgpmime/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -356,9 +356,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/pgpmime/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/pgpmime/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/pgpmime/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/pgpmime/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/spamassassin/Makefile.in claws-mail-3.3.0/src/plugins/spamassassin/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/spamassassin/Makefile.in	2008-02-08 05:40:50.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/spamassassin/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -327,9 +327,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/spamassassin/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/spamassassin/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/spamassassin/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/spamassassin/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/trayicon/libeggtrayicon/Makefile.in claws-mail-3.3.0/src/plugins/trayicon/libeggtrayicon/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/trayicon/libeggtrayicon/Makefile.in	2008-02-08 05:40:51.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/trayicon/libeggtrayicon/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -294,9 +294,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/trayicon/libeggtrayicon/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/trayicon/libeggtrayicon/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/trayicon/libeggtrayicon/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/trayicon/libeggtrayicon/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/src/plugins/trayicon/Makefile.in claws-mail-3.3.0/src/plugins/trayicon/Makefile.in
+--- claws-mail-3.3.0.old/src/plugins/trayicon/Makefile.in	2008-02-08 05:40:50.000000000 -0200
++++ claws-mail-3.3.0/src/plugins/trayicon/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -338,9 +338,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/trayicon/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/trayicon/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  src/plugins/trayicon/Makefile
++	  $(AUTOMAKE) --gnu  src/plugins/trayicon/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+diff -urN claws-mail-3.3.0.old/tools/Makefile.in claws-mail-3.3.0/tools/Makefile.in
+--- claws-mail-3.3.0.old/tools/Makefile.in	2008-02-08 05:40:51.000000000 -0200
++++ claws-mail-3.3.0/tools/Makefile.in	2008-03-11 16:24:08.000000000 -0300
+@@ -303,9 +303,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tools/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  tools/Makefile
++	  $(AUTOMAKE) --gnu  tools/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \