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
+22autotools.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,19 @@
+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 test for patched GTK supporting TAP-AND-HOLD.
+    - Added test for Maemo's tablet browser interface.
+  * Added IFDEFs based on the flags above to allow or not those resources
+    to be used. Right now UME has neither but any change on that should be
+    automatically detected and added to the build.
+
+ -- 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.final/src/action.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/action.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/action.c	2008-03-19 14:38:07.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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 			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.final/src/addrcustomattr.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/addrcustomattr.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/addrcustomattr.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/compose.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/compose.c	2008-03-19 14:38:07.000000000 -0300
++++ claws-mail-3.3.0.final/src/compose.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	g_signal_connect(G_OBJECT(text), "popup-menu",
+ 			 G_CALLBACK(compose_popup_menu), compose);
+ #else
+Index: claws-mail-3.3.0.final/src/editaddress.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/editaddress.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/editaddress.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/editldap.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/editldap.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/editldap.c	2008-03-19 14:38:07.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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/edittags.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/edittags.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/edittags.c	2008-03-19 14:38:07.000000000 -0300
+@@ -335,7 +335,7 @@
+ 	/* create the columns */
+ 	apply_window_create_list_view_columns(GTK_WIDGET(list_view));
+ 
+-#ifndef MAEMO
++#if (!defined MAEMO) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	g_signal_connect(G_OBJECT(list_view), "popup-menu",
+ 			 G_CALLBACK(apply_list_popup_menu), list_view);
+ #else
+Index: claws-mail-3.3.0.final/src/folderview.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/folderview.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/folderview.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	g_signal_connect(G_OBJECT(ctree), "popup-menu",
+ 			 G_CALLBACK(folderview_popup_menu), folderview);
+ #else
+Index: claws-mail-3.3.0.final/src/gtk/inputdialog.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/gtk/inputdialog.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/gtk/inputdialog.c	2008-03-19 14:38:07.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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/mimeview.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/mimeview.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/mimeview.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	g_signal_connect(G_OBJECT(button), "popup-menu",
+ 			 G_CALLBACK(icon_popup_menu), mimeview);
+ #else
+Index: claws-mail-3.3.0.final/src/plugins/pgpcore/passphrase.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/plugins/pgpcore/passphrase.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/plugins/pgpcore/passphrase.c	2008-03-19 14:38:07.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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+     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.final/src/prefs_account.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/prefs_account.c	2008-03-19 14:38:07.000000000 -0300
++++ claws-mail-3.3.0.final/src/prefs_account.c	2008-03-19 14:38:07.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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/prefs_actions.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/prefs_actions.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/prefs_actions.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/prefs_filtering.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/prefs_filtering.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/prefs_filtering.c	2008-03-19 14:38:07.000000000 -0300
+@@ -1814,7 +1814,7 @@
+ 	g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL);
+ #endif
+ 
+-#ifndef MAEMO
++#if (!defined MAEMO) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/prefs_template.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/prefs_template.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/prefs_template.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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.final/src/summaryview.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/summaryview.c	2008-03-19 14:38:07.000000000 -0300
++++ claws-mail-3.3.0.final/src/summaryview.c	2008-03-19 14:38:07.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) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	g_signal_connect(G_OBJECT(ctree), "popup-menu",
+ 			 G_CALLBACK(summary_popup_menu), summaryview);
+ #else
+Index: claws-mail-3.3.0.final/src/wizard.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/wizard.c	2008-03-19 14:33:18.000000000 -0300
++++ claws-mail-3.3.0.final/src/wizard.c	2008-03-19 14:38:07.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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	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) && (HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP)
+ 	hildon_gtk_entry_set_input_mode(GTK_ENTRY(wizard->recv_password), 
+ 		HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
+ #endif
+Index: claws-mail-3.3.0.final/src/common/utils.c
+===================================================================
+--- claws-mail-3.3.0.final.orig/src/common/utils.c	2008-03-19 14:38:07.000000000 -0300
++++ claws-mail-3.3.0.final/src/common/utils.c	2008-03-19 14:40:48.000000000 -0300
+@@ -62,12 +62,14 @@
+ 
+ #ifdef MAEMO
+ #include <libosso.h>
++#ifdef HAVE_MAEMO_TABLET_BROWSER
+ #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) || (!HAVE_MAEMO_TABLET_BROWSER)
+ 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 HAVE_MAEMO_TABLET_BROWSER)
+ 	gchar buf[BUFFSIZE];
+ 	gchar *p;
+ 	gchar encoded_uri[BUFFSIZE];
only in patch2:
unchanged:
--- claws-mail-3.3.0.orig/debian/patches/22autotools.patch
+++ claws-mail-3.3.0/debian/patches/22autotools.patch
@@ -0,0 +1,716 @@
+diff -urN claws-mail-3.3.0.final/aclocal.m4 claws-mail-3.3.0.final.test/aclocal.m4
+--- claws-mail-3.3.0.final/aclocal.m4	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/aclocal.m4	2008-03-19 14:24:02.000000000 -0300
+@@ -1643,7 +1643,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+diff -urN claws-mail-3.3.0.final/config/ltmain.sh claws-mail-3.3.0.final.test/config/ltmain.sh
+--- claws-mail-3.3.0.final/config/ltmain.sh	2008-02-02 11:28:24.000000000 -0200
++++ claws-mail-3.3.0.final.test/config/ltmain.sh	2008-02-07 22:54:46.000000000 -0200
+@@ -43,7 +43,7 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="1.5.26 Debian 1.5.26-1"
++VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
+ TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
+ 
+ # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+diff -urN claws-mail-3.3.0.final/config/Makefile.in claws-mail-3.3.0.final.test/config/Makefile.in
+--- claws-mail-3.3.0.final/config/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/config/Makefile.in	2008-03-19 14:24:35.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.final/doc/Makefile.in claws-mail-3.3.0.final.test/doc/Makefile.in
+--- claws-mail-3.3.0.final/doc/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/doc/Makefile.in	2008-03-19 14:24:32.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.final/doc/man/Makefile.in claws-mail-3.3.0.final.test/doc/man/Makefile.in
+--- claws-mail-3.3.0.final/doc/man/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/doc/man/Makefile.in	2008-03-19 14:24:32.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.final/m4/Makefile.in claws-mail-3.3.0.final.test/m4/Makefile.in
+--- claws-mail-3.3.0.final/m4/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/m4/Makefile.in	2008-03-19 14:24:32.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.final/Makefile.in claws-mail-3.3.0.final.test/Makefile.in
+--- claws-mail-3.3.0.final/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/Makefile.in	2008-03-19 14:24:32.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.final/manual/dist/html/Makefile.in claws-mail-3.3.0.final.test/manual/dist/html/Makefile.in
+--- claws-mail-3.3.0.final/manual/dist/html/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/dist/html/Makefile.in	2008-03-19 14:24:32.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.final/manual/dist/Makefile.in claws-mail-3.3.0.final.test/manual/dist/Makefile.in
+--- claws-mail-3.3.0.final/manual/dist/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/dist/Makefile.in	2008-03-19 14:24:32.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.final/manual/dist/pdf/Makefile.in claws-mail-3.3.0.final.test/manual/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.final/manual/dist/pdf/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/dist/pdf/Makefile.in	2008-03-19 14:24:33.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.final/manual/dist/ps/Makefile.in claws-mail-3.3.0.final.test/manual/dist/ps/Makefile.in
+--- claws-mail-3.3.0.final/manual/dist/ps/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/dist/ps/Makefile.in	2008-03-19 14:24:33.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.final/manual/dist/txt/Makefile.in claws-mail-3.3.0.final.test/manual/dist/txt/Makefile.in
+--- claws-mail-3.3.0.final/manual/dist/txt/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/dist/txt/Makefile.in	2008-03-19 14:24:33.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.final/manual/dtd/Makefile.in claws-mail-3.3.0.final.test/manual/dtd/Makefile.in
+--- claws-mail-3.3.0.final/manual/dtd/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/dtd/Makefile.in	2008-03-19 14:24:33.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.final/manual/es/dist/html/Makefile.in claws-mail-3.3.0.final.test/manual/es/dist/html/Makefile.in
+--- claws-mail-3.3.0.final/manual/es/dist/html/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/es/dist/html/Makefile.in	2008-03-19 14:24:33.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.final/manual/es/dist/Makefile.in claws-mail-3.3.0.final.test/manual/es/dist/Makefile.in
+--- claws-mail-3.3.0.final/manual/es/dist/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/es/dist/Makefile.in	2008-03-19 14:24:33.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.final/manual/es/dist/pdf/Makefile.in claws-mail-3.3.0.final.test/manual/es/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.final/manual/es/dist/pdf/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/es/dist/pdf/Makefile.in	2008-03-19 14:24:33.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.final/manual/es/dist/ps/Makefile.in claws-mail-3.3.0.final.test/manual/es/dist/ps/Makefile.in
+--- claws-mail-3.3.0.final/manual/es/dist/ps/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/es/dist/ps/Makefile.in	2008-03-19 14:24:33.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.final/manual/es/dist/txt/Makefile.in claws-mail-3.3.0.final.test/manual/es/dist/txt/Makefile.in
+--- claws-mail-3.3.0.final/manual/es/dist/txt/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/es/dist/txt/Makefile.in	2008-03-19 14:24:33.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.final/manual/es/Makefile.in claws-mail-3.3.0.final.test/manual/es/Makefile.in
+--- claws-mail-3.3.0.final/manual/es/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/es/Makefile.in	2008-03-19 14:24:33.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.final/manual/fr/dist/html/Makefile.in claws-mail-3.3.0.final.test/manual/fr/dist/html/Makefile.in
+--- claws-mail-3.3.0.final/manual/fr/dist/html/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/fr/dist/html/Makefile.in	2008-03-19 14:24:33.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.final/manual/fr/dist/Makefile.in claws-mail-3.3.0.final.test/manual/fr/dist/Makefile.in
+--- claws-mail-3.3.0.final/manual/fr/dist/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/fr/dist/Makefile.in	2008-03-19 14:24:33.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.final/manual/fr/dist/pdf/Makefile.in claws-mail-3.3.0.final.test/manual/fr/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.final/manual/fr/dist/pdf/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/fr/dist/pdf/Makefile.in	2008-03-19 14:24:33.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.final/manual/fr/dist/ps/Makefile.in claws-mail-3.3.0.final.test/manual/fr/dist/ps/Makefile.in
+--- claws-mail-3.3.0.final/manual/fr/dist/ps/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/fr/dist/ps/Makefile.in	2008-03-19 14:24:33.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.final/manual/fr/dist/txt/Makefile.in claws-mail-3.3.0.final.test/manual/fr/dist/txt/Makefile.in
+--- claws-mail-3.3.0.final/manual/fr/dist/txt/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/fr/dist/txt/Makefile.in	2008-03-19 14:24:34.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.final/manual/fr/Makefile.in claws-mail-3.3.0.final.test/manual/fr/Makefile.in
+--- claws-mail-3.3.0.final/manual/fr/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/fr/Makefile.in	2008-03-19 14:24:33.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.final/manual/Makefile.in claws-mail-3.3.0.final.test/manual/Makefile.in
+--- claws-mail-3.3.0.final/manual/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/Makefile.in	2008-03-19 14:24:32.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.final/manual/pl/dist/html/Makefile.in claws-mail-3.3.0.final.test/manual/pl/dist/html/Makefile.in
+--- claws-mail-3.3.0.final/manual/pl/dist/html/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/pl/dist/html/Makefile.in	2008-03-19 14:24:34.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.final/manual/pl/dist/Makefile.in claws-mail-3.3.0.final.test/manual/pl/dist/Makefile.in
+--- claws-mail-3.3.0.final/manual/pl/dist/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/pl/dist/Makefile.in	2008-03-19 14:24:34.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.final/manual/pl/dist/pdf/Makefile.in claws-mail-3.3.0.final.test/manual/pl/dist/pdf/Makefile.in
+--- claws-mail-3.3.0.final/manual/pl/dist/pdf/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/pl/dist/pdf/Makefile.in	2008-03-19 14:24:34.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.final/manual/pl/dist/ps/Makefile.in claws-mail-3.3.0.final.test/manual/pl/dist/ps/Makefile.in
+--- claws-mail-3.3.0.final/manual/pl/dist/ps/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/pl/dist/ps/Makefile.in	2008-03-19 14:24:34.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.final/manual/pl/dist/txt/Makefile.in claws-mail-3.3.0.final.test/manual/pl/dist/txt/Makefile.in
+--- claws-mail-3.3.0.final/manual/pl/dist/txt/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/pl/dist/txt/Makefile.in	2008-03-19 14:24:34.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.final/manual/pl/Makefile.in claws-mail-3.3.0.final.test/manual/pl/Makefile.in
+--- claws-mail-3.3.0.final/manual/pl/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/manual/pl/Makefile.in	2008-03-19 14:24:34.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.final/src/common/Makefile.in claws-mail-3.3.0.final.test/src/common/Makefile.in
+--- claws-mail-3.3.0.final/src/common/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/common/Makefile.in	2008-03-19 14:24:34.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.final/src/etpan/Makefile.in claws-mail-3.3.0.final.test/src/etpan/Makefile.in
+--- claws-mail-3.3.0.final/src/etpan/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/etpan/Makefile.in	2008-03-19 14:24:34.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.final/src/gtk/Makefile.in claws-mail-3.3.0.final.test/src/gtk/Makefile.in
+--- claws-mail-3.3.0.final/src/gtk/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/gtk/Makefile.in	2008-03-19 14:24:34.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.final/src/Makefile.in claws-mail-3.3.0.final.test/src/Makefile.in
+--- claws-mail-3.3.0.final/src/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/Makefile.in	2008-03-19 14:24:34.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.final/src/plugins/bogofilter/Makefile.in claws-mail-3.3.0.final.test/src/plugins/bogofilter/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/bogofilter/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/bogofilter/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/demo/Makefile.in claws-mail-3.3.0.final.test/src/plugins/demo/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/demo/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/demo/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/dillo_viewer/Makefile.in claws-mail-3.3.0.final.test/src/plugins/dillo_viewer/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/dillo_viewer/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/dillo_viewer/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/Makefile.in claws-mail-3.3.0.final.test/src/plugins/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/Makefile.in	2008-03-19 14:24:34.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.final/src/plugins/pgpcore/Makefile.in claws-mail-3.3.0.final.test/src/plugins/pgpcore/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/pgpcore/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/pgpcore/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/pgpinline/Makefile.in claws-mail-3.3.0.final.test/src/plugins/pgpinline/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/pgpinline/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/pgpinline/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/pgpmime/Makefile.in claws-mail-3.3.0.final.test/src/plugins/pgpmime/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/pgpmime/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/pgpmime/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/spamassassin/Makefile.in claws-mail-3.3.0.final.test/src/plugins/spamassassin/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/spamassassin/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/spamassassin/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/trayicon/libeggtrayicon/Makefile.in claws-mail-3.3.0.final.test/src/plugins/trayicon/libeggtrayicon/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/trayicon/libeggtrayicon/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/trayicon/libeggtrayicon/Makefile.in	2008-03-19 14:24:35.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.final/src/plugins/trayicon/Makefile.in claws-mail-3.3.0.final.test/src/plugins/trayicon/Makefile.in
+--- claws-mail-3.3.0.final/src/plugins/trayicon/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/src/plugins/trayicon/Makefile.in	2008-03-19 14:24:35.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.final/tools/Makefile.in claws-mail-3.3.0.final.test/tools/Makefile.in
+--- claws-mail-3.3.0.final/tools/Makefile.in	2008-03-12 16:32:58.000000000 -0300
++++ claws-mail-3.3.0.final.test/tools/Makefile.in	2008-03-19 14:24:35.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 \
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,17 @@
+Index: claws-mail-3.3.0.final/configure.ac
+===================================================================
+--- claws-mail-3.3.0.final.orig/configure.ac	2008-03-19 13:57:12.000000000 -0300
++++ claws-mail-3.3.0.final/configure.ac	2008-03-19 14:27:01.000000000 -0300
+@@ -502,6 +502,12 @@
+ 		else
+ 			AC_DEFINE(MAEMO, 1, Build for maemo)
+ 			AC_DEFINE(CHINOOK, 1, Maemo chinook)
++			AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[],[#include <gtk/gtk.h>])
++			AC_CHECK_HEADERS(tablet_browser_interface/tablet-browser-interface.h,,ac_cv_enable_maemo_tablet_browser=no)
++			if test x"$ac_cv_enable_maemo_tablet_browser" = xyes; then
++			    AC_DEFINE(HAVE_MAEMO_TABLET_BROWSER, 1, [Define to 1 if compiling for Maemo])
++			fi
++
+ 		fi
+ 	else
+ 		AC_DEFINE(MAEMO, 1, Build for maemo)