diff -u claws-mail-3.3.1/debian/patches/series claws-mail-3.3.1/debian/patches/series --- claws-mail-3.3.1/debian/patches/series +++ claws-mail-3.3.1/debian/patches/series @@ -5,0 +6,3 @@ +20hildoninterface.patch +21configure.ac.patch +22autotools.patch diff -u claws-mail-3.3.1/debian/rules claws-mail-3.3.1/debian/rules --- claws-mail-3.3.1/debian/rules +++ claws-mail-3.3.1/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,9 @@ --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.1/debian/control claws-mail-3.3.1/debian/control --- claws-mail-3.3.1/debian/control +++ claws-mail-3.3.1/debian/control @@ -8,7 +8,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 diff -u claws-mail-3.3.1/debian/changelog claws-mail-3.3.1/debian/changelog --- claws-mail-3.3.1/debian/changelog +++ claws-mail-3.3.1/debian/changelog @@ -1,3 +1,21 @@ +claws-mail (3.3.1-1ubuntu2) hardy; urgency=low + + * Updated LPIA features (LP: #198861) + * 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. + * Patch provided by Adilson Oliveira + + -- Stephan Hermann Wed, 19 Mar 2008 23:36:10 +0100 + claws-mail (3.3.1-1ubuntu1) hardy; urgency=low * Merged new debian upstream version (LP: #203332) only in patch2: unchanged: --- claws-mail-3.3.1.orig/manual/es/Makefile.in +++ claws-mail-3.3.1/manual/es/Makefile.in @@ -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 \ only in patch2: unchanged: --- claws-mail-3.3.1.orig/debian/patches/20hildoninterface.patch +++ claws-mail-3.3.1/debian/patches/20hildoninterface.patch @@ -0,0 +1,281 @@ +Index: claws-mail-3.3.1/src/action.c +=================================================================== +--- claws-mail-3.3.1.orig/src/action.c 2008-03-19 22:59:11.916139470 +0100 ++++ claws-mail-3.3.1/src/action.c 2008-03-19 23:21:43.836136431 +0100 +@@ -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 ++#ifdef 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.1/src/addrcustomattr.c +=================================================================== +--- claws-mail-3.3.1.orig/src/addrcustomattr.c 2008-03-19 22:59:11.931149080 +0100 ++++ claws-mail-3.3.1/src/addrcustomattr.c 2008-03-19 23:21:43.837135330 +0100 +@@ -275,7 +275,7 @@ + /* create the columns */ + custom_attr_window_create_list_view_columns(GTK_WIDGET(list_view)); + +-#ifndef MAEMO ++#ifndef 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.1/src/common/utils.c +=================================================================== +--- claws-mail-3.3.1.orig/src/common/utils.c 2008-03-19 23:21:43.552135042 +0100 ++++ claws-mail-3.3.1/src/common/utils.c 2008-03-19 23:21:43.909142480 +0100 +@@ -62,12 +62,14 @@ + + #ifdef MAEMO + #include ++#ifdef HAVE_MAEMO_TABLET_BROWSER + #ifdef CHINOOK + # include + #else + # include + #endif + #endif ++#endif + + #include "utils.h" + #include "socket.h" +@@ -3225,7 +3227,7 @@ + + return child_stdout; + } +-#ifndef MAEMO ++#if (!defined MAEMO) || (!HAVE_MAEMO_TABLET_BROWSER) + static gint is_unchanged_uri_char(char c) + { + switch (c) { +@@ -3264,7 +3266,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]; +Index: claws-mail-3.3.1/src/compose.c +=================================================================== +--- claws-mail-3.3.1.orig/src/compose.c 2008-03-19 23:21:43.561135125 +0100 ++++ claws-mail-3.3.1/src/compose.c 2008-03-19 23:21:43.983140825 +0100 +@@ -6318,7 +6318,7 @@ + G_CALLBACK(attach_selected), compose); + g_signal_connect(G_OBJECT(attach_clist), "button_press_event", + G_CALLBACK(attach_button_pressed), compose); +-#ifndef MAEMO ++#ifndef 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 +@@ -6770,7 +6770,7 @@ + G_CALLBACK(text_inserted), compose); + g_signal_connect(G_OBJECT(text), "button_press_event", + G_CALLBACK(text_clicked), compose); +-#ifndef MAEMO ++#ifndef 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.1/src/editaddress.c +=================================================================== +--- claws-mail-3.3.1.orig/src/editaddress.c 2008-03-19 22:59:11.973136696 +0100 ++++ claws-mail-3.3.1/src/editaddress.c 2008-03-19 23:21:43.985133886 +0100 +@@ -923,7 +923,7 @@ + GTK_NOTEBOOK( personeditdlg.notebook ), + gtk_notebook_get_nth_page( GTK_NOTEBOOK( personeditdlg.notebook ), pageNum ), label ); + +-#ifndef MAEMO ++#ifndef 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.1/src/editldap.c +=================================================================== +--- claws-mail-3.3.1.orig/src/editldap.c 2008-03-19 22:59:11.983137585 +0100 ++++ claws-mail-3.3.1/src/editldap.c 2008-03-19 23:21:44.000150282 +0100 +@@ -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 ++#ifdef 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.1/src/edittags.c +=================================================================== +--- claws-mail-3.3.1.orig/src/edittags.c 2008-03-19 22:59:11.998141428 +0100 ++++ claws-mail-3.3.1/src/edittags.c 2008-03-19 23:21:44.022138804 +0100 +@@ -335,7 +335,7 @@ + /* create the columns */ + apply_window_create_list_view_columns(GTK_WIDGET(list_view)); + +-#ifndef MAEMO ++#ifndef 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.1/src/folderview.c +=================================================================== +--- claws-mail-3.3.1.orig/src/folderview.c 2008-03-19 22:59:12.017140018 +0100 ++++ claws-mail-3.3.1/src/folderview.c 2008-03-19 23:21:44.025133898 +0100 +@@ -544,7 +544,7 @@ + g_signal_connect(G_OBJECT(ctree), "button_press_event", + G_CALLBACK(folderview_button_pressed), + folderview); +-#ifndef MAEMO ++#ifndef 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.1/src/gtk/inputdialog.c +=================================================================== +--- claws-mail-3.3.1.orig/src/gtk/inputdialog.c 2008-03-19 22:59:12.029134335 +0100 ++++ claws-mail-3.3.1/src/gtk/inputdialog.c 2008-03-19 23:21:44.100161166 +0100 +@@ -111,7 +111,7 @@ + gtk_widget_hide(icon_p); + is_pass = FALSE; + gtk_entry_set_visibility(GTK_ENTRY(entry), TRUE); +-#ifdef MAEMO ++#ifdef 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 ++#ifdef 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.1/src/mimeview.c +=================================================================== +--- claws-mail-3.3.1.orig/src/mimeview.c 2008-03-19 22:59:12.048142778 +0100 ++++ claws-mail-3.3.1/src/mimeview.c 2008-03-19 23:21:44.124139324 +0100 +@@ -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 ++#ifndef 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.1/src/plugins/pgpcore/passphrase.c +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/pgpcore/passphrase.c 2008-03-19 22:59:12.072136364 +0100 ++++ claws-mail-3.3.1/src/plugins/pgpcore/passphrase.c 2008-03-19 23:21:44.165134028 +0100 +@@ -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 ++#ifdef 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.1/src/prefs_account.c +=================================================================== +--- claws-mail-3.3.1.orig/src/prefs_account.c 2008-03-19 23:21:43.596139546 +0100 ++++ claws-mail-3.3.1/src/prefs_account.c 2008-03-19 23:21:44.169388709 +0100 +@@ -1137,7 +1137,7 @@ + GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0); + #endif + gtk_entry_set_visibility (GTK_ENTRY (pass_entry), FALSE); +-#ifdef MAEMO ++#ifdef 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 ++#ifdef 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.1/src/prefs_actions.c +=================================================================== +--- claws-mail-3.3.1.orig/src/prefs_actions.c 2008-03-19 22:59:12.100140041 +0100 ++++ claws-mail-3.3.1/src/prefs_actions.c 2008-03-19 23:21:44.191143168 +0100 +@@ -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.1/src/prefs_filtering.c +=================================================================== +--- claws-mail-3.3.1.orig/src/prefs_filtering.c 2008-03-19 22:59:12.116138256 +0100 ++++ claws-mail-3.3.1/src/prefs_filtering.c 2008-03-19 23:21:44.293378781 +0100 +@@ -1810,7 +1810,7 @@ + + list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL + (prefs_filtering_create_data_store()))); +-#ifdef MAEMO ++#if (!defined MAEMO) || (!HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP) + g_object_set(list_view, "allow-checkbox-mode", FALSE, NULL); + #endif + +Index: claws-mail-3.3.1/src/prefs_template.c +=================================================================== +--- claws-mail-3.3.1.orig/src/prefs_template.c 2008-03-19 22:59:12.130142658 +0100 ++++ claws-mail-3.3.1/src/prefs_template.c 2008-03-19 23:21:44.321130749 +0100 +@@ -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.1/src/summaryview.c +=================================================================== +--- claws-mail-3.3.1.orig/src/summaryview.c 2008-03-19 23:21:43.696135073 +0100 ++++ claws-mail-3.3.1/src/summaryview.c 2008-03-19 23:21:44.331135950 +0100 +@@ -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.1/src/wizard.c +=================================================================== +--- claws-mail-3.3.1.orig/src/wizard.c 2008-03-19 22:59:12.163141306 +0100 ++++ claws-mail-3.3.1/src/wizard.c 2008-03-19 23:21:44.351130119 +0100 +@@ -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 only in patch2: unchanged: --- claws-mail-3.3.1.orig/debian/patches/21configure.ac.patch +++ claws-mail-3.3.1/debian/patches/21configure.ac.patch @@ -0,0 +1,16 @@ +Index: claws-mail-3.3.1/configure.ac +=================================================================== +--- claws-mail-3.3.1.orig/configure.ac 2008-03-19 23:53:23.808390511 +0100 ++++ claws-mail-3.3.1/configure.ac 2008-03-19 23:53:35.914146377 +0100 +@@ -502,6 +502,11 @@ + else + AC_DEFINE(MAEMO, 1, Build for maemo) + AC_DEFINE(CHINOOK, 1, Maemo chinook) ++ AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[],[#include ]) ++ 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) only in patch2: unchanged: --- claws-mail-3.3.1.orig/debian/patches/22autotools.patch +++ claws-mail-3.3.1/debian/patches/22autotools.patch @@ -0,0 +1,930 @@ +Index: claws-mail-3.3.1/aclocal.m4 +=================================================================== +--- claws-mail-3.3.1.orig/aclocal.m4 2008-03-19 23:56:46.251140060 +0100 ++++ claws-mail-3.3.1/aclocal.m4 2008-03-19 23:57:24.881136392 +0100 +@@ -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) +Index: claws-mail-3.3.1/config/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/config/Makefile.in 2008-03-19 23:56:46.273138483 +0100 ++++ claws-mail-3.3.1/config/Makefile.in 2008-03-19 23:57:24.882135543 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/configure +=================================================================== +--- claws-mail-3.3.1.orig/configure 2008-03-19 23:56:46.287150536 +0100 ++++ claws-mail-3.3.1/configure 2008-03-19 23:57:24.915133481 +0100 +@@ -29162,6 +29162,224 @@ + #define CHINOOK 1 + _ACEOF + ++ { echo "$as_me:$LINENO: checking whether gtk_widget_tap_and_hold_setup is declared" >&5 ++echo $ECHO_N "checking whether gtk_widget_tap_and_hold_setup is declared... $ECHO_C" >&6; } ++if test "${ac_cv_have_decl_gtk_widget_tap_and_hold_setup+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++int ++main () ++{ ++#ifndef gtk_widget_tap_and_hold_setup ++ (void) gtk_widget_tap_and_hold_setup; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_cv_have_decl_gtk_widget_tap_and_hold_setup=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_have_decl_gtk_widget_tap_and_hold_setup=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_widget_tap_and_hold_setup" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_gtk_widget_tap_and_hold_setup" >&6; } ++if test $ac_cv_have_decl_gtk_widget_tap_and_hold_setup = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++for ac_header in tablet_browser_interface/tablet-browser-interface.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null && { ++ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || ++ test ! -s conftest.err ++ }; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++else ++ ac_cv_enable_maemo_tablet_browser=no ++fi ++ ++done ++ ++ if test x"$ac_cv_enable_maemo_tablet_browser" = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_MAEMO_TABLET_BROWSER 1 ++_ACEOF ++ ++ fi + fi + else + +Index: claws-mail-3.3.1/doc/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/doc/Makefile.in 2008-03-19 23:56:46.300139508 +0100 ++++ claws-mail-3.3.1/doc/Makefile.in 2008-03-19 23:57:24.917134755 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/doc/man/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/doc/man/Makefile.in 2008-03-19 23:56:46.314137561 +0100 ++++ claws-mail-3.3.1/doc/man/Makefile.in 2008-03-19 23:57:24.927131772 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/m4/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/m4/Makefile.in 2008-03-19 23:56:46.330139077 +0100 ++++ claws-mail-3.3.1/m4/Makefile.in 2008-03-19 23:57:25.034137209 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/Makefile.in 2008-03-19 23:56:46.350135811 +0100 ++++ claws-mail-3.3.1/manual/Makefile.in 2008-03-19 23:57:25.055134131 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/dist/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/dist/Makefile.in 2008-03-19 23:56:46.360139470 +0100 ++++ claws-mail-3.3.1/manual/dist/Makefile.in 2008-03-19 23:57:25.072138394 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/dist/html/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/dist/html/Makefile.in 2008-03-19 23:56:46.377137636 +0100 ++++ claws-mail-3.3.1/manual/dist/html/Makefile.in 2008-03-19 23:57:25.083133137 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/dist/pdf/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/dist/pdf/Makefile.in 2008-03-19 23:56:46.395137857 +0100 ++++ claws-mail-3.3.1/manual/dist/pdf/Makefile.in 2008-03-19 23:57:25.106138735 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/dist/ps/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/dist/ps/Makefile.in 2008-03-19 23:56:46.414136432 +0100 ++++ claws-mail-3.3.1/manual/dist/ps/Makefile.in 2008-03-19 23:57:25.123138930 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/dist/txt/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/dist/txt/Makefile.in 2008-03-19 23:56:46.434138910 +0100 ++++ claws-mail-3.3.1/manual/dist/txt/Makefile.in 2008-03-19 23:57:25.137130605 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/dtd/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/dtd/Makefile.in 2008-03-19 23:56:46.451134852 +0100 ++++ claws-mail-3.3.1/manual/dtd/Makefile.in 2008-03-19 23:57:25.156378673 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/es/dist/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/es/dist/Makefile.in 2008-03-19 23:56:46.469141187 +0100 ++++ claws-mail-3.3.1/manual/es/dist/Makefile.in 2008-03-19 23:57:25.170132110 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/es/dist/html/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/es/dist/html/Makefile.in 2008-03-19 23:56:46.485139337 +0100 ++++ claws-mail-3.3.1/manual/es/dist/html/Makefile.in 2008-03-19 23:57:25.265132253 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/es/dist/pdf/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/es/dist/pdf/Makefile.in 2008-03-19 23:56:46.503139034 +0100 ++++ claws-mail-3.3.1/manual/es/dist/pdf/Makefile.in 2008-03-19 23:57:25.287130583 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/es/dist/ps/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/es/dist/ps/Makefile.in 2008-03-19 23:56:46.518138385 +0100 ++++ claws-mail-3.3.1/manual/es/dist/ps/Makefile.in 2008-03-19 23:57:25.305132341 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/fr/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/fr/Makefile.in 2008-03-19 23:56:46.552143688 +0100 ++++ claws-mail-3.3.1/manual/fr/Makefile.in 2008-03-19 23:57:25.322132330 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/fr/dist/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/fr/dist/Makefile.in 2008-03-19 23:56:46.567138072 +0100 ++++ claws-mail-3.3.1/manual/fr/dist/Makefile.in 2008-03-19 23:57:25.347378841 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/fr/dist/html/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/fr/dist/html/Makefile.in 2008-03-19 23:56:46.587135558 +0100 ++++ claws-mail-3.3.1/manual/fr/dist/html/Makefile.in 2008-03-19 23:57:25.377130508 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/fr/dist/pdf/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/fr/dist/pdf/Makefile.in 2008-03-19 23:56:46.602140054 +0100 ++++ claws-mail-3.3.1/manual/fr/dist/pdf/Makefile.in 2008-03-19 23:57:25.390130627 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/fr/dist/ps/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/fr/dist/ps/Makefile.in 2008-03-19 23:56:46.618138484 +0100 ++++ claws-mail-3.3.1/manual/fr/dist/ps/Makefile.in 2008-03-19 23:57:25.411388708 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/fr/dist/txt/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/fr/dist/txt/Makefile.in 2008-03-19 23:56:46.642140393 +0100 ++++ claws-mail-3.3.1/manual/fr/dist/txt/Makefile.in 2008-03-19 23:57:25.428389683 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/pl/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/pl/Makefile.in 2008-03-19 23:56:46.657140029 +0100 ++++ claws-mail-3.3.1/manual/pl/Makefile.in 2008-03-19 23:57:25.445389339 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/pl/dist/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/pl/dist/Makefile.in 2008-03-19 23:56:46.670138524 +0100 ++++ claws-mail-3.3.1/manual/pl/dist/Makefile.in 2008-03-19 23:57:25.535133012 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/pl/dist/html/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/pl/dist/html/Makefile.in 2008-03-19 23:56:46.691138811 +0100 ++++ claws-mail-3.3.1/manual/pl/dist/html/Makefile.in 2008-03-19 23:57:25.554138726 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/pl/dist/pdf/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/pl/dist/pdf/Makefile.in 2008-03-19 23:56:46.708142736 +0100 ++++ claws-mail-3.3.1/manual/pl/dist/pdf/Makefile.in 2008-03-19 23:57:25.573135681 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/pl/dist/ps/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/pl/dist/ps/Makefile.in 2008-03-19 23:56:46.730141031 +0100 ++++ claws-mail-3.3.1/manual/pl/dist/ps/Makefile.in 2008-03-19 23:57:25.588136882 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/pl/dist/txt/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/pl/dist/txt/Makefile.in 2008-03-19 23:56:46.750138535 +0100 ++++ claws-mail-3.3.1/manual/pl/dist/txt/Makefile.in 2008-03-19 23:57:25.600132109 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/Makefile.in 2008-03-19 23:56:46.769138399 +0100 ++++ claws-mail-3.3.1/src/Makefile.in 2008-03-19 23:57:25.622389536 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/common/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/common/Makefile.in 2008-03-19 23:56:46.783139797 +0100 ++++ claws-mail-3.3.1/src/common/Makefile.in 2008-03-19 23:57:25.639134267 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/etpan/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/etpan/Makefile.in 2008-03-19 23:56:46.804140889 +0100 ++++ claws-mail-3.3.1/src/etpan/Makefile.in 2008-03-19 23:57:25.656134780 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/gtk/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/gtk/Makefile.in 2008-03-19 23:56:46.818135382 +0100 ++++ claws-mail-3.3.1/src/gtk/Makefile.in 2008-03-19 23:57:25.688378311 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/Makefile.in 2008-03-19 23:56:46.845136242 +0100 ++++ claws-mail-3.3.1/src/plugins/Makefile.in 2008-03-19 23:57:25.747142627 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/bogofilter/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/bogofilter/Makefile.in 2008-03-19 23:56:46.859137975 +0100 ++++ claws-mail-3.3.1/src/plugins/bogofilter/Makefile.in 2008-03-19 23:57:25.767130287 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/demo/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/demo/Makefile.in 2008-03-19 23:56:46.881141641 +0100 ++++ claws-mail-3.3.1/src/plugins/demo/Makefile.in 2008-03-19 23:57:25.790133143 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/dillo_viewer/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/dillo_viewer/Makefile.in 2008-03-19 23:56:46.893135531 +0100 ++++ claws-mail-3.3.1/src/plugins/dillo_viewer/Makefile.in 2008-03-19 23:57:25.802131834 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/pgpcore/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/pgpcore/Makefile.in 2008-03-19 23:56:46.914153527 +0100 ++++ claws-mail-3.3.1/src/plugins/pgpcore/Makefile.in 2008-03-19 23:57:25.819132135 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/pgpinline/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/pgpinline/Makefile.in 2008-03-19 23:56:46.928136005 +0100 ++++ claws-mail-3.3.1/src/plugins/pgpinline/Makefile.in 2008-03-19 23:57:25.841132592 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/pgpmime/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/pgpmime/Makefile.in 2008-03-19 23:56:46.944135103 +0100 ++++ claws-mail-3.3.1/src/plugins/pgpmime/Makefile.in 2008-03-19 23:57:25.860139391 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/spamassassin/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/spamassassin/Makefile.in 2008-03-19 23:56:46.962141276 +0100 ++++ claws-mail-3.3.1/src/plugins/spamassassin/Makefile.in 2008-03-19 23:57:25.885133770 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/trayicon/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/trayicon/Makefile.in 2008-03-19 23:56:46.977135813 +0100 ++++ claws-mail-3.3.1/src/plugins/trayicon/Makefile.in 2008-03-19 23:57:25.897137947 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/src/plugins/trayicon/libeggtrayicon/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/src/plugins/trayicon/libeggtrayicon/Makefile.in 2008-03-19 23:56:46.998138524 +0100 ++++ claws-mail-3.3.1/src/plugins/trayicon/libeggtrayicon/Makefile.in 2008-03-19 23:57:25.922131789 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/tools/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/tools/Makefile.in 2008-03-19 23:56:47.029135091 +0100 ++++ claws-mail-3.3.1/tools/Makefile.in 2008-03-19 23:57:26.019390212 +0100 +@@ -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 \ +Index: claws-mail-3.3.1/manual/es/dist/txt/Makefile.in +=================================================================== +--- claws-mail-3.3.1.orig/manual/es/dist/txt/Makefile.in 2008-03-19 23:57:36.208389196 +0100 ++++ claws-mail-3.3.1/manual/es/dist/txt/Makefile.in 2008-03-19 23:57:54.749129906 +0100 +@@ -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 \ only in patch2: unchanged: --- claws-mail-3.3.1.orig/Makefile.in +++ claws-mail-3.3.1/Makefile.in @@ -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 \