diff -Naur claws-mail-2.8.1-orig/src/addressadd.c claws-mail-2.8.1-ldap/src/addressadd.c
--- claws-mail-2.8.1-orig/src/addressadd.c	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/addressadd.c	2007-04-04 01:36:11.000000000 +0200
@@ -46,6 +46,9 @@
 #include "addrbook.h"
 #include "addrindex.h"
 #include "manage_window.h"
+#include "ldapserver.h"
+#include "ldapupdate.h"
+#include "alertpanel.h"
 
 typedef struct {
 	AddressBookFile	*book;
@@ -339,7 +342,8 @@
 	list = addrindex_get_interface_list( addrIndex );
 	while( list ) {
 		AddressInterface *interface = list->data;
-		if( interface->type == ADDR_IF_BOOK ) {
+		if( interface->type == ADDR_IF_BOOK || 
+				interface->type == ADDR_IF_LDAP ) {
 			nodeDS = interface->listSource;
 			while( nodeDS ) {
 				ds = nodeDS->data;
@@ -378,6 +382,7 @@
 	ItemPerson *person = NULL;
 	FolderInfo *fi = NULL;
 	addressadd_cancelled = FALSE;
+
 	if( ! addressadd_dlg.window ) addressadd_create();
 	gtk_widget_grab_focus(addressadd_dlg.ok_btn);
 	gtk_widget_show(addressadd_dlg.window);
@@ -415,6 +420,18 @@
 							returned_name, 
 							address, 
 							returned_remarks);
+			person->status = ADD_ENTRY;
+			if (fi->book->type == ADBOOKTYPE_LDAP) {
+				LdapServer *server = (LdapServer *) fi->book;
+				ldapsvr_set_modified(server, TRUE);
+				ldapsvr_update_book(server, person);
+				if (server->retVal != LDAPRC_SUCCESS) {
+					alertpanel( _("Add address(es)"),
+						"I was not able to add the specified address",
+						GTK_STOCK_CLOSE, NULL, NULL );
+					return server->retVal;
+				}
+			}
 			g_free(returned_name);
 			g_free(returned_remarks);
 			if( person ) retVal = TRUE;
diff -Naur claws-mail-2.8.1-orig/src/addressbook.c claws-mail-2.8.1-ldap/src/addressbook.c
--- claws-mail-2.8.1-orig/src/addressbook.c	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/addressbook.c	2007-04-03 23:48:40.000000000 +0200
@@ -89,6 +89,7 @@
 #include <pthread.h>
 #include "ldapserver.h"
 #include "editldap.h"
+#include "ldapupdate.h"
 
 #define ADDRESSBOOK_LDAP_BUSYMSG "Busy"
 #endif
@@ -534,16 +535,19 @@
  * Lookup table of error messages for LDAP errors.
  */
 static ErrMsgTableEntry _lutErrorsLDAP_[] = {
-	{ LDAPRC_SUCCESS,	N_("Success") },
-	{ LDAPRC_CONNECT,	N_("Error connecting to LDAP server") },
-	{ LDAPRC_INIT,		N_("Error initializing LDAP") },
-	{ LDAPRC_BIND,		N_("Error binding to LDAP server") },
-	{ LDAPRC_SEARCH,	N_("Error searching LDAP database") },
-	{ LDAPRC_TIMEOUT,	N_("Timeout performing LDAP operation") },
-	{ LDAPRC_CRITERIA,	N_("Error in LDAP search criteria") },
-	{ LDAPRC_NOENTRIES,	N_("No LDAP entries found for search criteria") },
-	{ LDAPRC_STOP_FLAG,	N_("LDAP search terminated on request") },
-	{ LDAPRC_TLS,		N_("Error starting TLS connection") },
+	{ LDAPRC_SUCCESS,			N_("Success") },
+	{ LDAPRC_CONNECT,			N_("Error connecting to LDAP server") },
+	{ LDAPRC_INIT,				N_("Error initializing LDAP") },
+	{ LDAPRC_BIND,				N_("Error binding to LDAP server") },
+	{ LDAPRC_SEARCH,			N_("Error searching LDAP database") },
+	{ LDAPRC_TIMEOUT,			N_("Timeout performing LDAP operation") },
+	{ LDAPRC_CRITERIA,			N_("Error in LDAP search criteria") },
+	{ LDAPRC_NOENTRIES,			N_("No LDAP entries found for search criteria") },
+	{ LDAPRC_STOP_FLAG,			N_("LDAP search terminated on request") },
+	{ LDAPRC_TLS,				N_("Error starting TLS connection") },
+	{ LDAPRC_NODN,				N_("Distinguised Name (dn) is missing") },
+	{ LDAPRC_NAMING_VIOLATION,	N_("Missing required information") },
+	{ LDAPRC_ALREADY_EXIST,		N_("Another contact exists with that key") },
 	{ 0,			NULL }
 };
 #endif
@@ -1452,10 +1456,16 @@
 			}
 			else if( aio->type == ADDR_ITEM_PERSON ) {
 				ItemPerson *item = ( ItemPerson * ) aio;
+				item->status = DELETE_ENTRY; 
 				addressbook_folder_remove_one_person( clist, item );
 				if (pobj->type == ADDR_ITEM_FOLDER)
 					addritem_folder_remove_person(ADAPTER_FOLDER(pobj)->itemFolder, item);
 				item = addrbook_remove_person( abf, item );
+				if (ds->type == ADDR_IF_LDAP) {
+					LdapServer *server = ds->rawDataSource;
+					ldapsvr_set_modified(server, TRUE);
+					ldapsvr_update_book(server, item);
+				}
 				if( item ) {
 					addritem_free_item_person( item );
 				}
@@ -1877,7 +1887,8 @@
 		iface = ds->interface;
 		if( ! iface->readOnly ) {
 			menu_set_sensitive( addrbook.list_factory, "/New Address", TRUE );
-			menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+			if (iface->type != ADDR_IF_LDAP)
+				menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
 			gtk_widget_set_sensitive( addrbook.reg_btn, TRUE );
 			if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
 			if( ! addrselect_test_empty( _addressSelect_ ) ) canCut = TRUE;
@@ -1898,7 +1909,8 @@
 			}
 			/* Folder */
 			if( pobj->type == ADDR_ITEM_FOLDER ) {
-				menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
+				if (iface->type != ADDR_IF_LDAP)
+					menu_set_sensitive( addrbook.list_factory, "/New Group", TRUE );
 				if( obj ) canEdit = TRUE;
 			}
 			if( ! addrclip_is_empty( _clipBoard_ ) ) canPaste = TRUE;
@@ -1908,7 +1920,7 @@
 		if( iface->type == ADDR_IF_LDAP ) {
 			if( obj ) canBrowse = TRUE;
 			canEdit = TRUE;
-			canDelete = FALSE;
+			canDelete = TRUE;
 		}
 	}
 	if( ! addrselect_test_empty( _addressSelect_ ) ) canCopy = TRUE;
@@ -2845,6 +2857,7 @@
 static void addressbook_new_address_from_book_post_cb( ItemPerson *person )
 {
 	if( person && addrbook.treeSelected == addrbook.opened ) {
+		person->status = ADD_ENTRY;
 		gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
 		addressbook_folder_refresh_one_person(
 			GTK_CTREE(addrbook.clist), person );
@@ -2855,6 +2868,7 @@
 static void addressbook_new_address_from_folder_post_cb( ItemPerson *person )
 {
 	if( person && addrbook.treeSelected == addrbook.opened) {
+		person->status = ADD_ENTRY;
 		gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
 		addressbook_set_clist(
 			gtk_ctree_node_get_row_data(GTK_CTREE(addrbook.ctree),
@@ -2884,6 +2898,17 @@
 														  addrbook.editaddress_vbox,
 														  addressbook_new_address_from_book_post_cb,
 														  TRUE );
+			if (abf->type == ADDR_IF_LDAP) {
+				LdapServer *server = ds->rawDataSource;
+				ldapsvr_set_modified(server, TRUE);
+				ldapsvr_update_book(server, NULL);
+				if (server->retVal != LDAPRC_SUCCESS) {
+					alertpanel( _("Add address(es)"),
+						addressbook_err2string(_lutErrorsLDAP_, server->retVal),
+						GTK_STOCK_CLOSE, NULL, NULL );
+					return;
+				}
+			}
 			if (prefs_common.addressbook_use_editaddress_dialog)
 				addressbook_new_address_from_book_post_cb( person );
 		}
@@ -2895,6 +2920,17 @@
 													  addrbook.editaddress_vbox,
 													  addressbook_new_address_from_folder_post_cb,
 													  TRUE );
+		if (abf->type == ADDR_IF_LDAP) {
+			LdapServer *server = ds->rawDataSource;
+			ldapsvr_set_modified(server, TRUE);
+			ldapsvr_update_book(server, NULL);
+			if (server->retVal != LDAPRC_SUCCESS) {
+				alertpanel( _("Add address(es)"),
+						addressbook_err2string(_lutErrorsLDAP_, server->retVal),
+					GTK_STOCK_CLOSE, NULL, NULL );
+				return;
+			}
+		}
 		if (prefs_common.addressbook_use_editaddress_dialog)
 			addressbook_new_address_from_folder_post_cb( person );
 	}
@@ -2947,7 +2983,7 @@
 
 	ds = addressbook_find_datasource( addrbook.treeSelected );
 	if( ds == NULL ) return NULL;
-	if( ds->type == ADDR_IF_BOOK ) abf = ds->rawDataSource;
+	if( ds->type == ADDR_IF_BOOK || ds->type == ADDR_IF_LDAP ) abf = ds->rawDataSource;
 	return abf;
 }
 
@@ -2980,6 +3016,7 @@
 static void addressbook_edit_address_post_cb( ItemPerson *person )
 {
 	if( person ) {
+
 		addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
 		invalidate_address_completion();
 	}
@@ -3053,7 +3090,11 @@
 			if  ( addressbook_edit_person( abf, NULL, person, TRUE, addrbook.editaddress_vbox,
 										   addressbook_edit_address_post_cb,
 										   (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
-				  != NULL ) {
+				  != NULL ) { 
+				if (abf->type == ADDR_IF_LDAP) {
+					ldapsvr_set_modified( (LdapServer *) abf, TRUE );
+					person->status = UPDATE_ENTRY;
+				}
 				if (prefs_common.addressbook_use_editaddress_dialog)
 					addressbook_edit_address_post_cb( person );
 			}
@@ -3067,8 +3108,12 @@
 									  addressbook_edit_address_post_cb,
 									  (prefs_common.addressbook_use_editaddress_dialog||force_focus) )
 			!= NULL ) {
-			if (prefs_common.addressbook_use_editaddress_dialog)
-				addressbook_edit_address_post_cb( person );
+				if (abf->type == ADDR_IF_LDAP) {
+					ldapsvr_set_modified( (LdapServer *) abf, TRUE );
+					person->status = UPDATE_ENTRY;
+				}
+				if (prefs_common.addressbook_use_editaddress_dialog)
+					addressbook_edit_address_post_cb( person );
 		}
 		return;
 	}
@@ -3204,6 +3249,9 @@
 			if( str ) {
 				text[COL_NAME] = str;
 			}
+			else if( person->nickName ) {
+				text[COL_NAME] = person->nickName;
+			}
 			else {
 				text[COL_NAME] = ADDRITEM_NAME(person);
 			}
diff -Naur claws-mail-2.8.1-orig/src/addrindex.c claws-mail-2.8.1-ldap/src/addrindex.c
--- claws-mail-2.8.1-orig/src/addrindex.c	2007-03-06 05:44:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/addrindex.c	2007-04-02 03:20:39.000000000 +0200
@@ -40,6 +40,7 @@
 #include "addrquery.h"
 #include "addr_compl.h"
 #include "utils.h"
+#include "alertpanel.h"
 
 #ifndef DEV_STANDALONE
 #include "prefs_gtk.h"
@@ -56,6 +57,7 @@
 #include "ldapserver.h"
 #include "ldapctrl.h"
 #include "ldapquery.h"
+#include "ldapupdate.h"
 #include "ldaputil.h"
 #endif
 
@@ -290,14 +292,15 @@
 	iface = addrindex_create_interface(
 			ADDR_IF_LDAP, "LDAP", TAG_IF_LDAP, TAG_DS_LDAP );
 #ifdef USE_LDAP
+	iface->readOnly = FALSE;
 	/* iface->haveLibrary = ldapsvr_test_ldap_lib(); */
 	iface->haveLibrary = ldaputil_test_ldap_lib();
 	iface->useInterface = iface->haveLibrary;
-	/* iface->getModifyFlag = ( void * ) ldapsvr_get_modified; */
+	iface->getModifyFlag = ( void * ) ldapsvr_get_modified;
 	iface->getAccessFlag = ( void * ) ldapsvr_get_accessed;
-	/* iface->getReadFlag   = ( void * ) ldapsvr_get_read_flag; */
+	iface->getReadFlag   = ( void * ) ldapsvr_get_read_flag;
 	iface->getStatusCode = ( void * ) ldapsvr_get_status;
-	/* iface->getReadData   = ( void * ) ldapsvr_read_data; */
+	iface->getReadData   = ( void * ) ldapsvr_read_data;
 	iface->getRootFolder = ( void * ) ldapsvr_get_root_folder;
 	iface->getListFolder = ( void * ) ldapsvr_get_list_folder;
 	iface->getListPerson = ( void * ) ldapsvr_get_list_person;
@@ -1712,7 +1715,39 @@
 * return: Status code, from addrIndex->retVal.
 */
 gint addrindex_save_data( AddressIndex *addrIndex ) {
+	GList *nodeIf, *nodeDS;
+
 	g_return_val_if_fail( addrIndex != NULL, -1 );
+	nodeIf = addrIndex->interfaceList;
+
+	/* save LDAP interfaces */
+	while ( nodeIf ) {
+		AddressInterface *iface = nodeIf->data;
+		if( iface->type == ADDR_IF_LDAP ) {
+			nodeDS = iface->listSource;
+			while( nodeDS ) {
+				AddressDataSource *ds = nodeDS->data;
+				LdapServer *abf = ds->rawDataSource;
+				if( ldapsvr_get_read_flag( abf ) ) {
+					if( ldapsvr_get_modified( abf ) ) {
+						ldapsvr_update_book( abf, NULL );
+						if( abf->retVal != LDAPRC_SUCCESS ) {
+							alertpanel( _("Updating address(es)"),
+								_("Updating did not success. Changes are not written to Directory."),
+								GTK_STOCK_CLOSE, NULL, NULL );
+						}
+						else {
+							abf->retVal = MGU_SUCCESS;
+							ldapsvr_set_modified( abf, FALSE );
+						}
+					}
+				}
+				nodeDS = g_list_next( nodeDS );
+			}
+			break;
+		}
+		nodeIf = g_list_next( nodeIf );
+	}
 
 	addrIndex->retVal = MGU_NO_FILE;
 	if( addrIndex->fileName == NULL || *addrIndex->fileName == '\0' ) return addrIndex->retVal;
diff -Naur claws-mail-2.8.1-orig/src/addritem.c claws-mail-2.8.1-ldap/src/addritem.c
--- claws-mail-2.8.1-orig/src/addritem.c	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/addritem.c	2007-03-25 18:13:59.000000000 +0200
@@ -224,6 +224,7 @@
 	person->listAttrib = NULL;
 	person->externalID = NULL;
 	person->isOpened = FALSE;
+	person->status = NONE;
 	return person;
 }
 
@@ -243,6 +244,7 @@
 		itemNew->lastName = g_strdup( item->lastName );
 		itemNew->nickName = g_strdup( item->nickName );
 		itemNew->externalID = g_strdup( item->externalID );
+		itemNew->status = item->status;
 	}
 	return itemNew;
 }
@@ -463,6 +465,17 @@
 		addritem_print_attribute( node->data, stream );
 		node = g_list_next( node );
 	}
+	gchar *current_status;
+	switch (person->status) {
+		case NONE: current_status = g_strdup("Unchanged"); break;
+		case ADD_ENTRY: current_status = g_strdup("New"); break;
+		case UPDATE_ENTRY: current_status = g_strdup("Updated"); break;
+		case DELETE_ENTRY: current_status = g_strdup("Deleted"); break;
+		default: current_status = g_strdup("Unknown");
+	}
+	fprintf( stream, "\t\tStatus: %s\n", current_status );
+	if ( current_status )
+		g_free(current_status);
 	fprintf( stream, "\t===\n" );
 }
 
diff -Naur claws-mail-2.8.1-orig/src/addritem.h claws-mail-2.8.1-ldap/src/addritem.h
--- claws-mail-2.8.1-orig/src/addritem.h	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/addritem.h	2007-03-24 03:33:16.000000000 +0100
@@ -53,6 +53,13 @@
 	ADDRFOLDER_QUERY_RESULTS
 } AddressFolderType;
 
+typedef enum {
+	NONE,
+	ADD_ENTRY,
+	UPDATE_ENTRY,
+	DELETE_ENTRY
+} ContactStatus;
+
 typedef struct _AddrItemObject AddrItemObject;
 struct _AddrItemObject {
 	ItemObjectType type;
@@ -72,6 +79,7 @@
 	GList    *listEMail;
 	GList    *listAttrib;
 	gboolean isOpened;
+	ContactStatus status;
 };
 
 typedef struct _ItemEMail ItemEMail;
diff -Naur claws-mail-2.8.1-orig/src/common/Makefile.in claws-mail-2.8.1-ldap/src/common/Makefile.in
--- claws-mail-2.8.1-orig/src/common/Makefile.in	2007-03-06 05:56:44.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/common/Makefile.in	2007-03-28 20:11:09.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
 @SET_MAKE@
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -41,10 +45,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -73,18 +81,17 @@
 	stringtable.lo claws.lo template.lo utils.lo uuencode.lo \
 	xml.lo xmlprops.lo
 libclawscommon_la_OBJECTS = $(am_libclawscommon_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libclawscommon_la_SOURCES)
 DIST_SOURCES = $(am__libclawscommon_la_SOURCES_DIST)
 am__clawscommoninclude_HEADERS_DIST = fnmatch.h w32lib.h base64.h \
@@ -107,6 +114,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -118,11 +127,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -132,6 +169,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -163,7 +202,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -193,11 +231,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -205,6 +244,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -214,6 +255,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -230,14 +273,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -249,7 +292,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -280,15 +322,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 PLUGINDIR = $(pkglibdir)/plugins/
 noinst_LTLIBRARIES = libclawscommon.la
 @OS_WIN32_TRUE@arch_sources = fnmatch.c \
@@ -387,9 +426,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 \
@@ -421,7 +460,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libclawscommon.la: $(libclawscommon_la_OBJECTS) $(libclawscommon_la_DEPENDENCIES) 
-	$(LINK)  $(libclawscommon_la_OBJECTS) $(libclawscommon_la_LIBADD) $(LIBS)
+	$(LINK)  $(libclawscommon_la_LDFLAGS) $(libclawscommon_la_OBJECTS) $(libclawscommon_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -466,22 +505,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlprops.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -491,9 +530,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-clawscommonincludeHEADERS: $(clawscommoninclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(clawscommonincludedir)" || $(MKDIR_P) "$(DESTDIR)$(clawscommonincludedir)"
+	test -z "$(clawscommonincludedir)" || $(mkdir_p) "$(DESTDIR)$(clawscommonincludedir)"
 	@list='$(clawscommoninclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -558,21 +601,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -588,7 +632,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(clawscommonincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -623,7 +667,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -637,20 +681,12 @@
 
 install-data-am: install-clawscommonincludeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,24 +707,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-clawscommonincludeHEADERS
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-clawscommonincludeHEADERS uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-clawscommonincludeHEADERS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am \
-	uninstall-clawscommonincludeHEADERS
+	uninstall-clawscommonincludeHEADERS uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/editaddress.c claws-mail-2.8.1-ldap/src/editaddress.c
--- claws-mail-2.8.1-orig/src/editaddress.c	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/editaddress.c	2007-03-29 23:38:40.000000000 +0200
@@ -83,6 +83,7 @@
 	gint rowIndAttrib;
 	gboolean editNew;
 	gboolean read_only;
+	gboolean ldap;
 } personeditdlg;
 
 /* transient data */
@@ -471,7 +472,7 @@
 
 static void edit_person_attrib_list_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
 	UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
-	if( attrib && !personeditdlg.read_only) {
+	if( attrib && !personeditdlg.read_only && !personeditdlg.ldap ) {
 		gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atname), attrib->name );
 		gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), attrib->value );
 		gtk_widget_set_sensitive(personeditdlg.attrib_del, TRUE);
@@ -500,7 +501,7 @@
 		personeditdlg.rowIndAttrib = -1 + row;
 	} 
 	
-	if (!personeditdlg.read_only)
+	if (!personeditdlg.read_only && !personeditdlg.ldap)
 		gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
 	
 	edit_person_status_show( NULL );
@@ -986,7 +987,7 @@
 {
 	gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_attrib), 0) != NULL;
 
-	if (personeditdlg.read_only)
+	if (personeditdlg.read_only || personeditdlg.ldap)
 		return;
 
 	if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)) == NULL
@@ -1201,20 +1202,20 @@
 	gtk_widget_set_sensitive(personeditdlg.entry_name,    !personeditdlg.read_only);
 	gtk_widget_set_sensitive(personeditdlg.entry_first,   !personeditdlg.read_only);
 	gtk_widget_set_sensitive(personeditdlg.entry_last,    !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.entry_nick,    !personeditdlg.read_only);
+	gtk_widget_set_sensitive(personeditdlg.entry_nick,    !personeditdlg.read_only && !personeditdlg.ldap);
 	gtk_widget_set_sensitive(personeditdlg.entry_email,   !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.entry_alias,   !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.entry_remarks, !personeditdlg.read_only);
+	gtk_widget_set_sensitive(personeditdlg.entry_alias,   !personeditdlg.read_only && !personeditdlg.ldap);
+	gtk_widget_set_sensitive(personeditdlg.entry_remarks, !personeditdlg.read_only && !personeditdlg.ldap);
 	gtk_widget_set_sensitive(personeditdlg.email_up,      !personeditdlg.read_only);
 	gtk_widget_set_sensitive(personeditdlg.email_down,    !personeditdlg.read_only);
 	gtk_widget_set_sensitive(personeditdlg.email_del,     !personeditdlg.read_only);
 	gtk_widget_set_sensitive(personeditdlg.email_mod,     !personeditdlg.read_only);
 	gtk_widget_set_sensitive(personeditdlg.email_add,     !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.entry_atname,  !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.entry_atvalue, !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.attrib_add,    !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.attrib_del,    !personeditdlg.read_only);
-	gtk_widget_set_sensitive(personeditdlg.attrib_mod,    !personeditdlg.read_only);
+	gtk_widget_set_sensitive(personeditdlg.entry_atname,  !personeditdlg.read_only && !personeditdlg.ldap);
+	gtk_widget_set_sensitive(personeditdlg.entry_atvalue, !personeditdlg.read_only && !personeditdlg.ldap);
+	gtk_widget_set_sensitive(personeditdlg.attrib_add,    !personeditdlg.read_only && !personeditdlg.ldap);
+	gtk_widget_set_sensitive(personeditdlg.attrib_del,    !personeditdlg.read_only && !personeditdlg.ldap);
+	gtk_widget_set_sensitive(personeditdlg.attrib_mod,    !personeditdlg.read_only && !personeditdlg.ldap);
 }
 
 static void addressbook_edit_person_flush_transient( void )
@@ -1343,6 +1344,7 @@
 	current_person = person;
 	current_parent_folder = parent_folder;
 	edit_person_close_post_update_cb = post_update_cb;
+	personeditdlg.ldap = (abf->type == ADBOOKTYPE_LDAP)? TRUE : FALSE;
 
 	if( !personeditdlg.container )
 		addressbook_edit_person_create(parent_container, &cancelled);
diff -Naur claws-mail-2.8.1-orig/src/etpan/Makefile.in claws-mail-2.8.1-ldap/src/etpan/Makefile.in
--- claws-mail-2.8.1-orig/src/etpan/Makefile.in	2007-03-06 05:56:44.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/etpan/Makefile.in	2007-03-28 20:11:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
 @SET_MAKE@
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -40,10 +44,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -55,18 +63,17 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libclawsetpan_la_OBJECTS = etpan-thread-manager.lo imap-thread.lo
 libclawsetpan_la_OBJECTS = $(am_libclawsetpan_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libclawsetpan_la_SOURCES)
 DIST_SOURCES = $(libclawsetpan_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -83,6 +90,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -94,11 +103,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -108,6 +145,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -139,7 +178,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -169,11 +207,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -181,6 +220,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -190,6 +231,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -206,14 +249,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -225,7 +268,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -256,15 +298,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 PLUGINDIR = $(pkglibdir)/plugins/
 noinst_LTLIBRARIES = libclawsetpan.la
 libclawsetpan_la_SOURCES = \
@@ -302,9 +341,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 \
@@ -332,7 +371,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libclawsetpan.la: $(libclawsetpan_la_OBJECTS) $(libclawsetpan_la_DEPENDENCIES) 
-	$(LINK)  $(libclawsetpan_la_OBJECTS) $(libclawsetpan_la_LIBADD) $(LIBS)
+	$(LINK)  $(libclawsetpan_la_LDFLAGS) $(libclawsetpan_la_OBJECTS) $(libclawsetpan_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -344,22 +383,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imap-thread.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -369,9 +408,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-clawsetpanincludeHEADERS: $(clawsetpaninclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(clawsetpanincludedir)" || $(MKDIR_P) "$(DESTDIR)$(clawsetpanincludedir)"
+	test -z "$(clawsetpanincludedir)" || $(mkdir_p) "$(DESTDIR)$(clawsetpanincludedir)"
 	@list='$(clawsetpaninclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -436,21 +479,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -466,7 +510,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(clawsetpanincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -501,7 +545,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -515,20 +559,12 @@
 
 install-data-am: install-clawsetpanincludeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -549,23 +585,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-clawsetpanincludeHEADERS
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-clawsetpanincludeHEADERS uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-clawsetpanincludeHEADERS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-clawsetpanincludeHEADERS
+	tags uninstall uninstall-am uninstall-clawsetpanincludeHEADERS \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/gtk/Makefile.in claws-mail-2.8.1-ldap/src/gtk/Makefile.in
--- claws-mail-2.8.1-orig/src/gtk/Makefile.in	2007-03-06 05:56:44.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/gtk/Makefile.in	2007-03-28 20:11:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
 @SET_MAKE@
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -40,10 +44,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -62,18 +70,17 @@
 	menu.lo pluginwindow.lo prefswindow.lo progressdialog.lo \
 	quicksearch.lo sslcertwindow.lo claws-marshal.lo
 libclawsgtk_la_OBJECTS = $(am_libclawsgtk_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libclawsgtk_la_SOURCES)
 DIST_SOURCES = $(libclawsgtk_la_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -90,6 +97,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -101,11 +110,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -115,6 +152,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -146,7 +185,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -176,11 +214,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -188,6 +227,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -197,6 +238,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -213,14 +256,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -232,7 +275,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -263,15 +305,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 PLUGINDIR = $(pkglibdir)/plugins/
 DOCDIR = $(docdir)
 noinst_LTLIBRARIES = libclawsgtk.la
@@ -366,9 +405,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 \
@@ -396,7 +435,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libclawsgtk.la: $(libclawsgtk_la_OBJECTS) $(libclawsgtk_la_DEPENDENCIES) 
-	$(LINK)  $(libclawsgtk_la_OBJECTS) $(libclawsgtk_la_LIBADD) $(LIBS)
+	$(LINK)  $(libclawsgtk_la_LDFLAGS) $(libclawsgtk_la_OBJECTS) $(libclawsgtk_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -430,22 +469,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslcertwindow.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -455,9 +494,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-clawsgtkincludeHEADERS: $(clawsgtkinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(clawsgtkincludedir)" || $(MKDIR_P) "$(DESTDIR)$(clawsgtkincludedir)"
+	test -z "$(clawsgtkincludedir)" || $(mkdir_p) "$(DESTDIR)$(clawsgtkincludedir)"
 	@list='$(clawsgtkinclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -522,21 +565,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -553,7 +597,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(clawsgtkincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -590,7 +634,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -604,20 +648,12 @@
 
 install-data-am: install-clawsgtkincludeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -638,23 +674,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-clawsgtkincludeHEADERS
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-clawsgtkincludeHEADERS uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-clawsgtkincludeHEADERS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-clawsgtkincludeHEADERS
+	tags uninstall uninstall-am uninstall-clawsgtkincludeHEADERS \
+	uninstall-info-am
 
 
 claws-marshal.h: claws-marshal.list
diff -Naur claws-mail-2.8.1-orig/src/ldapctrl.c claws-mail-2.8.1-ldap/src/ldapctrl.c
--- claws-mail-2.8.1-orig/src/ldapctrl.c	2007-03-06 05:44:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapctrl.c	2007-04-04 01:34:59.000000000 +0200
@@ -52,6 +52,7 @@
 	ctl->attribCName = g_strdup( LDAPCTL_ATTR_COMMONNAME );
 	ctl->attribFName = g_strdup( LDAPCTL_ATTR_GIVENNAME );
 	ctl->attribLName = g_strdup( LDAPCTL_ATTR_SURNAME );
+	ctl->attribDName = g_strdup( LDAPCTL_ATTR_DISPLAYNAME );
 	ctl->maxEntries = LDAPCTL_MAX_ENTRIES;
 	ctl->timeOut = LDAPCTL_DFL_TIMEOUT;
 	ctl->maxQueryAge = LDAPCTL_DFL_QUERY_AGE;
@@ -256,6 +257,7 @@
 	g_free( ctl->attribCName );
 	g_free( ctl->attribFName );
 	g_free( ctl->attribLName );
+	g_free( ctl->attribDName );
 
 	ldapctl_criteria_list_clear( ctl );
 
@@ -269,6 +271,7 @@
 	ctl->attribCName = NULL;
 	ctl->attribFName = NULL;
 	ctl->attribLName = NULL;
+	ctl->attribDName = NULL;
 	ctl->maxEntries = 0;
 	ctl->timeOut = 0;
 	ctl->maxQueryAge = 0;
@@ -316,6 +319,7 @@
 	fprintf( stream, "attr comn: '%s'\n", ctl->attribCName );
 	fprintf( stream, "attr frst: '%s'\n", ctl->attribFName );
 	fprintf( stream, "attr last: '%s'\n", ctl->attribLName );
+	fprintf( stream, "attr disn: '%s'\n", ctl->attribDName );
 	fprintf( stream, "max entry: %d\n",   ctl->maxEntries );
 	fprintf( stream, "  timeout: %d\n",   ctl->timeOut );
 	fprintf( stream, "  max age: %d\n",   ctl->maxQueryAge );
@@ -361,6 +365,7 @@
 	ctlTo->attribCName = g_strdup( ctlFrom->attribCName );
 	ctlTo->attribFName = g_strdup( ctlFrom->attribFName );
 	ctlTo->attribLName = g_strdup( ctlFrom->attribLName );
+	ctlTo->attribDName = g_strdup( ctlFrom->attribDName );
 
 	/* Copy search criteria */
 	node = ctlFrom->listCriteria;
diff -Naur claws-mail-2.8.1-orig/src/ldapctrl.h claws-mail-2.8.1-ldap/src/ldapctrl.h
--- claws-mail-2.8.1-orig/src/ldapctrl.h	2007-03-06 05:44:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapctrl.h	2007-04-04 01:29:58.000000000 +0200
@@ -44,8 +44,8 @@
 #define LDAPCTL_ATTR_COMMONNAME "cn"
 #define LDAPCTL_ATTR_GIVENNAME  "givenName"
 #define LDAPCTL_ATTR_SURNAME    "sn"
-
-#define LDAPCTL_DFL_ATTR_LIST   "mail, cn, givenName, sn"
+#define LDAPCTL_ATTR_DISPLAYNAME "displayName"
+#define LDAPCTL_DFL_ATTR_LIST   "mail, cn, givenName, sn, displayName"
 
 /*
  * Search matching options.
@@ -74,6 +74,7 @@
 	gchar     *attribCName;
 	gchar     *attribFName;
 	gchar     *attribLName;
+	gchar	  *attribDName;
 	GList     *listCriteria;
 	pthread_mutex_t *mutexCtl;
 };
diff -Naur claws-mail-2.8.1-orig/src/ldapquery.c claws-mail-2.8.1-ldap/src/ldapquery.c
--- claws-mail-2.8.1-orig/src/ldapquery.c	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapquery.c	2007-04-04 02:35:21.000000000 +0200
@@ -353,12 +353,13 @@
  */
 static void ldapqry_free_lists(
 		GSList *listName, GSList *listAddr, GSList *listFirst,
-		GSList *listLast )
+		GSList *listLast, GSList *listDisplay )
 {
 	mgu_free_list( listName );
 	mgu_free_list( listAddr );
 	mgu_free_list( listFirst );
 	mgu_free_list( listLast );
+	mgu_free_list( listDisplay );
 }
 
 /**
@@ -430,7 +431,7 @@
 static GList *ldapqry_build_items_fl(
 		AddressCache *cache, LdapQuery *qry, gchar *dn,
 		GSList *listName, GSList *listAddr, GSList *listFirst,
-		GSList *listLast )
+		GSList *listLast, GSList *listDisplay )
 {
 	GSList *nodeAddress;
 	gchar *firstName = NULL, *lastName = NULL, *fullName = NULL;
@@ -444,6 +445,11 @@
 	if( folder == NULL ) return listReturn;
 	if( listAddr == NULL ) return listReturn;
 
+	if ( listDisplay ) {
+		allocated = FALSE;
+		fullName = listDisplay->data;
+	}
+
 	/* Find longest first name in list */
 	firstName = mgu_slist_longest_entry( listFirst );
 
@@ -452,28 +458,30 @@
 		lastName = listLast->data;
 	}
 
-	/* Find longest common name */
-	allocated = FALSE;
-	fullName = mgu_slist_longest_entry( listName );
-	if( fullName == NULL ) {
-		/* Format a full name from first and last names */
-		if( firstName ) {
-			if( lastName ) {
-				fullName = g_strdup_printf( "%s %s", firstName, lastName );
+	if ( fullName == NULL ) {
+		/* Find longest common name */
+		allocated = FALSE;
+		fullName = mgu_slist_longest_entry( listName );
+		if( fullName == NULL ) {
+			/* Format a full name from first and last names */
+			if( firstName ) {
+				if( lastName ) {
+					fullName = g_strdup_printf( "%s %s", firstName, lastName );
+				}
+				else {
+					fullName = g_strdup_printf( "%s", firstName );
+				}
 			}
 			else {
-				fullName = g_strdup_printf( "%s", firstName );
+				if( lastName ) {
+					fullName = g_strdup_printf( "%s", lastName );
+				}
 			}
-		}
-		else {
-			if( lastName ) {
-				fullName = g_strdup_printf( "%s", lastName );
+			if( fullName ) {
+				g_strchug( fullName ); g_strchomp( fullName );
+				allocated = TRUE;
 			}
 		}
-		if( fullName ) {
-			g_strchug( fullName ); g_strchomp( fullName );
-			allocated = TRUE;
-		}
 	}
 
 	/* Add person into folder */		
@@ -495,6 +503,7 @@
 		addrcache_id_email( cache, email );
 		addrcache_person_add_email( cache, person, email );
 		addritem_person_add_email( person, email );
+		/*addritem_print_item_email(email, stdout);*/
 		listReturn = g_list_append( listReturn, email );
 		nodeAddress = g_slist_next( nodeAddress );
 	}
@@ -525,6 +534,7 @@
 	BerElement *ber;
 	GSList *listName = NULL, *listAddress = NULL;
 	GSList *listFirst = NULL, *listLast = NULL;
+	GSList *listDisplay = NULL;
 	GList *listReturn;
 
 	listReturn = NULL;
@@ -548,6 +558,9 @@
 		else if( strcasecmp( attribute, ctl->attribLName ) == 0 ) {
 			listLast = ldapqry_add_single_value( ld, e, attribute );
 		}
+		else if( strcasecmp( attribute, ctl->attribDName ) == 0 ) {
+			listDisplay = ldapqry_add_single_value( ld, e, attribute );
+		}
 
 		/* Free memory used to store attribute */
 		ldap_memfree( attribute );
@@ -555,11 +568,11 @@
 
 	/* Format and add items to cache */
 	listReturn = ldapqry_build_items_fl(
-		cache, qry, dnEntry, listName, listAddress, listFirst, listLast );
+		cache, qry, dnEntry, listName, listAddress, listFirst, listLast, listDisplay );
 
 	/* Free up */
-	ldapqry_free_lists( listName, listAddress, listFirst, listLast );
-	listName = listAddress = listFirst = listLast = NULL;
+	ldapqry_free_lists( listName, listAddress, listFirst, listLast, listDisplay );
+	listName = listAddress = listFirst = listLast = listDisplay = NULL;
 
 	if( ber != NULL ) {
 		ber_free( ber, 0 );
@@ -826,6 +839,11 @@
 			qry->callBackEntry( qry, ADDRQUERY_ID(qry), listEMail, qry->data );
 		}
 		else {
+			/*GList *node = listEMail;
+			while (node) {
+				addritem_print_item_email(node->data, stdout);
+				node = g_list_next(node);
+			}*/
 			g_list_free( listEMail );
 		}
 		pthread_mutex_unlock( qry->mutexEntry );
diff -Naur claws-mail-2.8.1-orig/src/ldapserver.c claws-mail-2.8.1-ldap/src/ldapserver.c
--- claws-mail-2.8.1-orig/src/ldapserver.c	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapserver.c	2007-04-02 00:59:25.000000000 +0200
@@ -39,6 +39,7 @@
 #include "ldapctrl.h"
 #include "ldapquery.h"
 #include "ldapserver.h"
+#include "ldaputil.h"
 #include "utils.h"
 #include "adbookbase.h"
 
@@ -695,6 +696,20 @@
 	return qry;
 }
 
+gint ldapsvr_read_data( LdapServer *server )
+{
+	g_return_val_if_fail( server != NULL, -1 );
+
+	//printf( "...addrbook_read_data :%s:\n", addrcache_get_name( server->addressCache ) );
+	
+	addrcache_clear(server->addressCache);
+	server->addressCache->modified = FALSE;
+	server->addressCache->accessFlag = FALSE;
+	server->addressCache->dataRead = TRUE;
+	addrcache_set_dirty(server->addressCache, FALSE);
+	return 0;
+}
+
 #endif	/* USE_LDAP */
 
 /*
diff -Naur claws-mail-2.8.1-orig/src/ldapserver.h claws-mail-2.8.1-ldap/src/ldapserver.h
--- claws-mail-2.8.1-orig/src/ldapserver.h	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapserver.h	2007-04-03 10:02:24.000000000 +0200
@@ -45,6 +45,9 @@
 #define LDAPRC_NOENTRIES  -7
 #define LDAPRC_STOP_FLAG  -8
 #define LDAPRC_TLS        -9
+#define LDAPRC_NODN		  -10
+#define LDAPRC_NAMING_VIOLATION  -11
+#define LDAPRC_ALREADY_EXIST -12
 
 typedef struct _LdapServer LdapServer;
 struct _LdapServer {
@@ -72,6 +75,7 @@
 gboolean ldapsvr_get_read_flag	( LdapServer *server );
 gboolean ldapsvr_get_search_flag( LdapServer *server );
 void ldapsvr_set_search_flag	( LdapServer *server, const gboolean value );
+gint ldapsvr_read_data ( LdapServer *server );
 
 void ldapsvr_print_data		( LdapServer *server, FILE *stream );
 void ldapsvr_cancel_read	( LdapServer *server );
diff -Naur claws-mail-2.8.1-orig/src/ldapupdate.c claws-mail-2.8.1-ldap/src/ldapupdate.c
--- claws-mail-2.8.1-orig/src/ldapupdate.c	1970-01-01 01:00:00.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapupdate.c	2007-04-04 02:47:31.000000000 +0200
@@ -0,0 +1,923 @@
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2003-2007 Michael Rasmussen and the Claws Mail team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * Functions necessary to access LDAP servers.
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#ifdef USE_LDAP
+
+#include <glib.h>
+#include <sys/time.h>
+#include <string.h>
+#include <ldap.h>
+#include <lber.h>
+
+#include "ldapupdate.h"
+#include "mgutils.h"
+#include "addritem.h"
+#include "addrcache.h"
+#include "ldapctrl.h"
+#include "ldapquery.h"
+#include "ldapserver.h"
+#include "ldaputil.h"
+#include "utils.h"
+#include "adbookbase.h"
+
+/**
+ * Structure to hold user defined attributes
+ * from contacts
+ */
+typedef struct _AttrKeyValue AttrKeyValue;
+struct _AttrKeyValue {
+	gchar *key;
+	gchar *value;
+};
+
+/**
+ * Structure to hold contact information.
+ * Each addressbook will have 0..N contacts.
+ */
+typedef struct _EmailKeyValue EmailKeyValue;
+struct _EmailKeyValue {
+	gchar *mail;
+	gchar *alias;
+	gchar *remarks;
+};
+
+/**
+ * Structure to hold information about RDN.
+ */
+typedef struct _Rdn Rdn;
+struct _Rdn {
+	gchar *attribute;
+	gchar *value;
+	gchar *new_dn;
+};
+
+/**
+ * Retrieve address group item for update.
+ * \param group  Group to print.
+ * \param array  GHashTAble of item_group, or <i>NULL</i> if none created.
+ */
+void ldapsvr_retrieve_item_group(ItemGroup *group, GHashTable *array) {
+	/* Not implemented in this release */
+	g_return_if_fail(group != NULL);
+}
+
+/**
+ * Create an initial EmailKeyValue structure
+ * \return empty structure
+ */
+EmailKeyValue *emailkeyvalue_create() {
+	EmailKeyValue *buf;
+
+	buf = g_new0(EmailKeyValue, 1);
+	buf->alias = NULL;
+	buf->mail = NULL;
+	buf->remarks = NULL;
+	return buf;
+}
+
+/**
+ * Create an initial AttrKeyValue structure
+ * \return empty structure
+ */
+AttrKeyValue *attrkeyvalue_create() {
+	AttrKeyValue *buf;
+
+	buf = g_new0(AttrKeyValue, 1);
+	buf->key = NULL;
+	buf->value = NULL;
+	return buf;
+}
+
+/**
+ * Retrieve E-Mail address object for update.
+ * \param item   ItemEmail to update.
+ * \return object, or <i>NULL</i> if none created.
+ */
+EmailKeyValue *ldapsvr_retrieve_item_email(ItemEMail *item) {
+	g_return_val_if_fail(item != NULL, NULL);
+	EmailKeyValue *newItem = emailkeyvalue_create();		
+	newItem->alias = g_strdup(ADDRITEM_NAME(item));
+	newItem->mail = g_strdup(item->address);
+	newItem->remarks = g_strdup(item->remarks);
+	return newItem;
+}
+
+/**
+ * Retrieve user attribute object for update.
+ * \param item   UserAttribute to update.
+ * \return object, or <i>NULL</i> if none created.
+ */
+AttrKeyValue *ldapsvr_retrieve_attribute(UserAttribute *item) {
+	g_return_val_if_fail(item != NULL, NULL);
+	AttrKeyValue *newItem = attrkeyvalue_create();
+	newItem->key = g_strdup(item->name);
+	newItem->value = g_strdup(item->value);
+	return newItem;
+}
+
+/**
+ * Retrieve person object for update.
+ * \param person ItemPerson to update.
+ * \param array GHashTable with user input.
+ * \return false if update is not needed, or true if update is needed.
+ */
+gboolean ldapsvr_retrieve_item_person(ItemPerson *person, GHashTable *array) {
+	GList *node, *attr;
+
+	g_return_val_if_fail(person != NULL, FALSE);
+	switch (person->status) {
+		case NONE: return FALSE;
+		case ADD_ENTRY: g_hash_table_insert(array, "status", "new"); break;
+		case UPDATE_ENTRY: g_hash_table_insert(array, "status", "update"); break;
+		case DELETE_ENTRY: g_hash_table_insert(array, "status", "delete"); break;
+		default: g_critical("ldapsvr_retrieve_item_person->Unknown status: %d", person->status);
+	}
+	g_hash_table_insert(array, "uid", ADDRITEM_ID(person));
+	g_hash_table_insert(array, "cn", ADDRITEM_NAME(person));
+	g_hash_table_insert(array, "givenName", person->firstName);
+	g_hash_table_insert(array, "sn", person->lastName);
+	g_hash_table_insert(array, "nickName", person->nickName);
+	g_hash_table_insert(array, "dn", person->externalID);
+	node = person->listEMail;
+	attr = NULL;
+	while (node) {
+		EmailKeyValue *newEmail = ldapsvr_retrieve_item_email(node->data);
+		if (newEmail)
+			attr = g_list_append(attr, newEmail);
+		node = g_list_next(node);
+	}
+	g_hash_table_insert(array, "mail", attr);
+/* Not implemented in this release.
+	node = person->listAttrib;
+	attr = NULL;
+	while (node) {
+		AttrKeyValue *newAttr = ldapsvr_retrieve_attribute(node->data)
+		if (newAttr)
+			attr = g_list_append(attr, newAttr);
+		node = g_list_next(node);
+	}
+	g_hash_table_insert(array, "attribute", attr);
+*/
+	return TRUE;
+}
+
+/**
+ * Print contents of contacts hashtable for debug.
+ * This function must be called with g_hash_table_foreach.
+ * \param key Key to process.
+ * \param data Data to process.
+ * \param fd Output stream.
+ */
+void ldapsvr_print_contacts_hashtable(gpointer key, gpointer data, gpointer fd) {
+	gchar *keyName = (gchar *) key;
+	GList *node;
+
+	if (g_ascii_strcasecmp("mail", keyName) == 0) {
+		node = (GList *) data;
+		while (node) {
+			EmailKeyValue *item = node->data;
+			if (debug_get_mode()) {
+				debug_print("\t\talias = %s\n", item->alias);
+				debug_print("\t\tmail = %s\n", item->mail);
+				debug_print("\t\tremarks = %s\n", item->remarks);
+			}
+			else {
+				FILE *stream = (FILE *) fd;
+				fprintf(stream, "\t\talias = %s\n", item->alias);
+				fprintf(stream, "\t\tmail = %s\n", item->mail);
+				fprintf(stream, "\t\tremarks = %s\n", item->remarks);
+			}
+			node = g_list_next(node);
+		}
+	}
+	else if (g_ascii_strcasecmp("attribute", keyName) == 0) {
+		node = (GList *) data;
+		while (node) {
+			AttrKeyValue *item = node->data;
+			if (debug_get_mode()) {
+				debug_print("\t\t%s = %s\n", item->key, item->value);
+			}
+			else {
+				FILE *stream = (FILE *) fd;
+				fprintf(stream, "\t\t%s = %s\n", item->key, item->value);
+			}
+			node = g_list_next(node);
+		}
+	}
+	else {
+		if (debug_get_mode())
+			debug_print("\t\t%s = %s\n", keyName, (gchar *) data);
+		else {
+			FILE *stream = (FILE *) fd;
+			fprintf(stream, "\t\t%s = %s\n", keyName, (gchar *) data);
+		}
+	}
+}
+
+/**
+ * Free list of changed contacts
+ *
+ * \param list List of GHashTable
+ */
+void ldapsvr_free_hashtable(GList *list) {
+	while (list) {
+		g_hash_table_destroy(list->data);
+		list = g_list_next(list);
+	}
+	g_list_free(list);
+}
+
+/**
+ * Get person object from cache
+ *
+ * \param server Resource to LDAP
+ * \param uid PersonID in cache
+ * \return person object, or <i>NULL</i> if fail
+ */
+ItemPerson *ldapsvr_get_contact(LdapServer *server, gchar *uid) {
+	g_return_val_if_fail(server != NULL || uid != NULL, NULL);
+	AddrItemObject *aio = addrcache_get_object(server->addressCache, uid);
+	if (aio) {
+		if(aio->type == ITEMTYPE_PERSON) {
+			return (ItemPerson *) aio;
+		}
+	}
+	return NULL;
+}
+
+/**
+ * Connect to LDAP server.
+ * \param  ctl Control object to process.
+ * \return LDAP Resource to LDAP.
+ */
+LDAP *ldapsvr_connect(LdapControl *ctl) {
+	LDAP *ld = NULL;
+	gint rc;
+	gint version;
+	gchar *uri = NULL;
+
+	g_return_val_if_fail(ctl != NULL, NULL);
+
+	uri = g_strdup_printf("ldap%s://%s:%d",
+				ctl->enableSSL?"s":"",
+				ctl->hostName, ctl->port);
+	ldap_initialize(&ld, uri);
+	g_free(uri);
+
+	if (ld == NULL)
+		return NULL;
+
+	debug_print("connected to LDAP host %s on port %d\n", ctl->hostName, ctl->port);
+
+#ifdef USE_LDAP_TLS
+	/* Handle TLS */
+	version = LDAP_VERSION3;
+	rc = ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+	if (rc == LDAP_OPT_SUCCESS) {
+		ctl->version = LDAP_VERSION3;
+	}
+
+	if (ctl->version == LDAP_VERSION3) {
+		if (ctl->enableTLS && !ctl->enableSSL) {
+			rc = ldap_start_tls_s(ld, NULL, NULL);
+			
+			if (rc != LDAP_SUCCESS) {
+				fprintf(stderr, "LDAP Error(tls): ldap_simple_bind_s: %s\n",
+					ldap_err2string(rc));
+				return NULL;
+			}
+		}
+	}
+#endif
+
+	/* Bind to the server, if required */
+	if (ctl->bindDN) {
+		if (* ctl->bindDN != '\0') {
+			rc = claws_ldap_simple_bind_s(ld, ctl->bindDN, ctl->bindPass);
+			if (rc != LDAP_SUCCESS) {
+				fprintf(stderr, "bindDN: %s, bindPass: %s\n", ctl->bindDN, ctl->bindPass);
+				fprintf(stderr, "LDAP Error(bind): ldap_simple_bind_s: %s\n",
+					ldap_err2string(rc));
+				return NULL;
+			}
+		}
+	}
+	return ld;
+}
+
+/**
+ * Disconnect to LDAP server.
+ * \param ld Resource to LDAP.
+ */
+void ldapsvr_disconnect(LDAP *ld) {
+	/* Disconnect */
+	g_return_if_fail(ld != NULL);
+	ldap_unbind_ext(ld, NULL, NULL);
+}
+
+/**
+ * Create an initial Rdn structure
+ *
+ * \return empty structure
+ */
+Rdn *rdn_create() {
+	Rdn *buf;
+
+	buf = g_new0(Rdn, 1);
+	buf->attribute = NULL;
+	buf->value = NULL;
+	buf->new_dn = NULL;
+	return buf;
+}
+
+/**
+ * update Rdn structure
+ *
+ * \param rdn Rdn structure to update
+ * \param head Uniq part of dn
+ * \param tail Common part of dn
+ */
+void update_rdn(Rdn *rdn, gchar *head, gchar *tail) {
+	rdn->value = g_strdup(head);
+	rdn->new_dn = g_strdup_printf("mail=%s%s", head, tail);
+}
+
+/**
+ * Deside if dn needs to be changed
+ *
+ * \param hash GHashTable with user input.
+ * \param dn dn for current object
+ * \return Rdn structure
+ */
+Rdn *ldapsvr_modify_dn(GHashTable *hash, gchar *dn) {
+	Rdn *rdn;
+
+	g_return_val_if_fail(hash != NULL || dn != NULL, NULL);
+	gchar *pos = g_strstr_len(dn, strlen(dn), "=");
+	gchar *compare = g_strndup(dn, pos - dn);
+	/* To avoid futile warning */
+	if (*pos++) ;
+	gchar *rest = g_strstr_len(pos, strlen(pos), ",");
+	gchar *val = g_strndup(pos, rest - pos);
+	if (val == NULL) {
+		if (compare)
+			g_free(compare);
+		return NULL;
+	}
+	rdn = rdn_create();
+	rdn->value = g_strdup(val);
+	rdn->attribute = g_strdup(compare);
+	g_free(val);
+	if (strcmp("mail", rdn->attribute) == 0) {
+		GList *list = g_hash_table_lookup(hash, rdn->attribute);
+		while (list) {
+			EmailKeyValue *item = list->data;
+			compare = g_strdup((gchar *) item->mail);
+			if (strcmp(compare, rdn->value) == 0) {
+				update_rdn(rdn, compare, rest);
+				g_free(compare);
+				return rdn;
+			}
+			list = g_list_next(list);
+		}
+		// if compare and rdn->attribute are equal then last email removed/empty
+		if (strcmp(compare, rdn->attribute) != 0) {
+	 		// RDN changed. Find new
+			update_rdn(rdn, compare, rest);
+			g_free(compare);
+			return rdn;
+		}
+		else {
+			// We cannot remove dn
+			g_free(compare);
+			return NULL;
+		}
+	}
+	else {
+		compare = g_hash_table_lookup(hash, rdn->attribute);
+		// if compare and rdn->attribute are equal then dn removed/empty
+		if (strcmp(compare, rdn->attribute) != 0) {
+			update_rdn(rdn, compare, rest);
+			return rdn;
+		}
+		else {
+			// We cannot remove dn
+			return NULL;
+		}
+	}
+	return NULL;
+}
+
+/**
+ * This macro is borrowed from the Balsa project
+ * Creates a LDAPMod structure
+ *
+ * \param mods Empty LDAPMod structure
+ * \param modarr Array with values to insert
+ * \param op Operation to perform on LDAP
+ * \param attr Attribute to insert
+ * \param strv Empty array which is NULL terminated
+ * \param val Value for attribute
+ */
+#define SETMOD(mods,modarr,op,attr,strv,val) \
+   do { (mods) = &(modarr); (modarr).mod_type=attr; (modarr).mod_op=op;\
+        (strv)[0]=(val); (modarr).mod_values=strv; \
+      } while(0)
+
+/**
+ * Creates a LDAPMod structure
+ *
+ * \param mods Empty LDAPMod structure
+ * \param modarr Array with values to insert
+ * \param op Operation to perform on LDAP
+ * \param attr Attribute to insert
+ * \param strv Array with values to insert. Must be NULL terminated
+ */
+#define SETMODS(mods,modarr,op,attr,strv) \
+   do { (mods) = &(modarr); (modarr).mod_type=attr; \
+	   	(modarr).mod_op=op; (modarr).mod_values=strv; \
+      } while(0)
+#define MODSIZE 10
+
+/**
+ * Clean up, close LDAP connection, and refresh cache
+ *
+ * \param ld Resource to LDAP
+ * \param server AddressBook resource
+ * \param contact GHashTable with current changed object
+ */
+void clean_up(LDAP *ld, LdapServer *server, GHashTable *contact) {
+	ItemPerson *person = 
+		ldapsvr_get_contact(server, g_hash_table_lookup(contact , "uid"));
+	if (person) {
+		person->status = NONE;
+		gchar *displayName = g_hash_table_lookup(contact, "displayName");
+		if (displayName)
+			person->nickName = g_strdup(displayName);
+	}
+	if (ld)
+		ldapsvr_disconnect(ld);
+	ldapsvr_force_refresh(server);
+	ldapsvr_free_all_query(server);
+}
+
+/**
+ * Get cn attribute from dn
+ *
+ * \param dn Distinguesh Name for current object
+ * \return AttrKeyValue, or <i>NULL</i> if none created
+ */
+AttrKeyValue *get_cn(gchar *dn) {
+	g_return_val_if_fail(dn != NULL, NULL);
+	AttrKeyValue *cn = attrkeyvalue_create();
+	gchar *start = g_strstr_len(dn, strlen(dn), "cn");
+	if (start == NULL)
+		return NULL;
+	gchar *end = g_strstr_len(start, strlen(start), ",");
+	gchar *item = g_strndup(start, end - start);
+	if (item == NULL)
+		return NULL;
+	gchar **key_value = g_strsplit(item, "=", 2);
+	cn->key = g_strdup(key_value[0]);
+	cn->value = g_strdup(key_value[1]);
+	g_strfreev(key_value);
+	g_free(item);
+	return cn;
+}
+
+/**
+ * Get ou or o attribute from dn
+ *
+ * \param dn Distinguesh Name for current object
+ * \return AttrKeyValue, or <i>NULL</i> if none created
+ */
+AttrKeyValue *get_ou(gchar *dn) {
+	g_return_val_if_fail(dn != NULL, NULL);
+	AttrKeyValue *ou = attrkeyvalue_create();
+	gchar *start = g_strstr_len(dn, strlen(dn), ",o=");
+	if (start == NULL)
+		start = g_strstr_len(dn, strlen(dn), ",ou=");
+	if (start == NULL)
+		return NULL;
+	// avoid futile warning
+	if (*start++);
+	gchar *end = g_strstr_len(start, strlen(start), ",");
+	gchar *item = g_strndup(start, end - start);
+	if (item == NULL)
+		return NULL;
+	gchar **key_value = g_strsplit(item, "=", 2);
+	ou->key = g_strdup(key_value[0]);
+	ou->value = g_strdup(key_value[1]);
+	g_strfreev(key_value);
+	g_free(item);
+	return ou;
+}
+
+/**
+ * Print the contents of a LDAPMod structure for debuging purposes
+ *
+ * \param mods LDAPMod structure
+ */
+void ldapsvr_print_ldapmod(LDAPMod *mods[]) {
+	gchar *mod_op;
+	int i;
+
+	fprintf( stderr, "Type\n");
+	for (i = 0; NULL != mods[i]; i++) {
+		LDAPMod *mod = (LDAPMod *) mods[i];
+		switch (mod->mod_op) {
+			case LDAP_MOD_ADD: mod_op = g_strdup("ADD"); break;
+			case LDAP_MOD_REPLACE: mod_op = g_strdup("MODIFY"); break;
+			case LDAP_MOD_DELETE: mod_op = g_strdup("DELETE"); break;
+			default: mod_op = g_strdup("UNKNOWN");
+		}
+		fprintf( stderr, "Operation: %s\tType:%s\nValues:\n", mod_op, mod->mod_type);
+		gchar **vals = mod->mod_vals.modv_strvals;
+		while (*vals) {
+			fprintf( stderr, "\t%s\n", *vals++);
+		}
+	}
+}
+
+/**
+ * Add new contact to LDAP
+ *
+ * \param server AddressBook resource
+ * \param contact GHashTable with object to add
+ */
+void ldapsvr_add_contact(LdapServer *server, GHashTable *contact) {
+	gchar *email = NULL, *param = NULL;
+	LDAP *ld = NULL;
+	LDAPMod *mods[MODSIZE];
+	LDAPMod modarr[7];
+	gint cnt = 0;
+    char *cn[] = {NULL, NULL};
+	char *displayName[] = {NULL, NULL};
+    char *givenName[] = {NULL, NULL};
+    char **mail = NULL;
+    char *sn[] = {NULL, NULL};
+	char *org[] = {NULL, NULL};
+	char *obj[] = {/*"top",*/ "person", "organizationalPerson", "inetOrgPerson", NULL}; 
+
+	g_return_if_fail(server != NULL || contact != NULL);
+	GList *node = g_hash_table_lookup(contact , "mail");
+	if (node) {
+		EmailKeyValue *newEmail = node->data;
+		email = g_strdup(newEmail->mail);
+	}
+	if (email == NULL) {
+		server->retVal = LDAPRC_NODN;
+		return;
+	}
+	gchar *base_dn = g_strdup_printf("mail=%s,%s", email, server->control->baseDN);
+	g_free(email);
+	ItemPerson *person = 
+		ldapsvr_get_contact(server, g_hash_table_lookup(contact , "uid"));
+	person->externalID = g_strdup(base_dn);
+	debug_print("dn: %s\n", base_dn);
+	ld = ldapsvr_connect(server->control);
+	if (ld == NULL) {
+		clean_up(ld, server, contact);
+		return;
+	}
+	SETMODS(mods[cnt], modarr[cnt], LDAP_MOD_ADD, "objectClass", obj);
+	cnt++;
+	AttrKeyValue *ou = get_ou(base_dn);
+	if (ou == NULL) {
+		clean_up(ld, server, contact);
+		return;
+	}
+	SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_ADD, ou->key, org, ou->value);
+	cnt++;
+	AttrKeyValue *commonName = get_cn(base_dn);
+	if (commonName == NULL) {
+		param = g_hash_table_lookup(contact , "cn");
+		if (param) {
+			SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_ADD, "cn", cn, param);
+		}
+		else {
+			clean_up(ld, server, contact);
+			return;
+		}
+	}
+	else {
+		SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_ADD, commonName->key, cn, commonName->value);
+		cnt++;
+		param = g_hash_table_lookup(contact , "cn");
+		SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_ADD, "displayName", displayName, param);
+		g_hash_table_insert(contact, "displayName", param);
+	}
+	cnt++;
+	param = g_hash_table_lookup(contact , "givenName");
+	if (param) {
+		SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_ADD, "givenName", givenName, param);
+		cnt++;
+	}
+	GList *mailList = g_hash_table_lookup(contact , "mail");
+	if (mailList) {
+		mail = g_malloc(sizeof(*mail));
+		char **tmp = g_malloc(sizeof(*tmp));
+		mail = tmp;
+		while (mailList) {
+			EmailKeyValue *item = mailList->data;
+			*tmp++ = g_strdup((gchar *) item->mail);
+			mailList = g_list_next(mailList);
+		}
+		*tmp = NULL;
+		SETMODS(mods[cnt], modarr[cnt], LDAP_MOD_ADD, "mail", mail);
+		cnt++;
+	}
+	param = g_hash_table_lookup(contact, "sn");
+	if (param == NULL)
+		param = g_strdup("Some SN");
+	SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_ADD, "sn", sn, param);
+	cnt++;
+	mods[cnt] = NULL;
+	if (debug_get_mode()) {
+		ldapsvr_print_ldapmod(mods);
+	}
+	server->retVal = LDAPRC_SUCCESS;
+	int rc = ldap_add_ext_s(ld, base_dn, mods, NULL, NULL);
+	if (rc) {
+		switch (rc) {
+			case LDAP_ALREADY_EXISTS: 
+				server->retVal = LDAPRC_ALREADY_EXIST;
+				break;
+			default:
+				fprintf(stderr, "ldap_modify for dn=%s\" failed[0x%x]: %s\n",base_dn, rc, ldap_err2string(rc));
+				server->retVal = LDAPRC_NAMING_VIOLATION;
+		}
+	}
+	g_free(base_dn);
+	clean_up(ld, server, contact);
+}
+
+/**
+ * Update contact to LDAP
+ *
+ * \param server AddressBook resource
+ * \param contact GHashTable with object to update
+ */
+void ldapsvr_update_contact(LdapServer *server, GHashTable *contact) {
+	LDAP *ld = NULL;
+	LDAPMod *mods[MODSIZE];
+	LDAPMod modarr[4];
+	gint cnt = 0;
+	gchar *param, *dn;
+	Rdn *NoRemove = NULL;
+    char *cn[]   = {NULL, NULL};
+    char *givenName[]   = {NULL, NULL};
+    char **mail = NULL;
+    char *sn[]   = {NULL, NULL};
+
+	g_return_if_fail(server != NULL || contact != NULL);
+	ld = ldapsvr_connect(server->control);
+	if (ld == NULL) {
+		clean_up(ld, server, contact);
+		return;
+	}
+	dn = g_hash_table_lookup(contact, "dn");
+	if (dn == NULL) {
+		clean_up(ld, server, contact);
+		return;
+	}
+	NoRemove = ldapsvr_modify_dn(contact, dn);
+	if (NoRemove) {
+		/* We are trying to change RDN */
+		gchar *newRdn = g_strdup_printf("%s=%s", NoRemove->attribute, NoRemove->value);
+		int rc = ldap_modrdn2_s(ld, dn, newRdn, 1);
+		if(rc != LDAP_SUCCESS) {
+			if (rc ==  LDAP_ALREADY_EXISTS) {
+				/* We are messing with a contact with more than one listed email
+				 * address and the email we are changing is not the one used for dn
+				 */
+				/* It needs to be able to handle renaming errors to an already defined
+				 * dn. For now we just refuse the update. It will be caught later on as
+				 * a LDAPRC_NAMING_VIOLATION error.
+				 */
+			}
+			else {
+				fprintf(stderr, "Current dn: %s\n", dn);
+				fprintf(stderr, "new dn: %s\n", newRdn);
+				fprintf(stderr, "LDAP Error(ldap_modrdn2_s) failed[0x%x]: %s\n", rc, ldap_err2string(rc));
+				g_free(newRdn);
+				return;
+			}
+		}
+		else {
+			g_free(newRdn);
+			dn = g_strdup(NoRemove->new_dn);
+		}
+	}
+	else {
+		server->retVal = LDAPRC_NODN;
+		clean_up(ld, server, contact);
+		return;
+	}
+	param = g_hash_table_lookup(contact , "cn");
+	if (param && (strcmp(param, NoRemove->value) != 0 && strcmp("cn", NoRemove->attribute) != 0)) {
+		SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_REPLACE, "cn", cn, param);
+		cnt++;
+	}
+	param = g_hash_table_lookup(contact , "givenName");
+	if (param && (strcmp(param, NoRemove->value) != 0 && strcmp("givenName", NoRemove->attribute) != 0)) {
+		SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_REPLACE, "givenName", givenName, param);
+		cnt++;
+	}
+	GList *mailList = g_hash_table_lookup(contact , "mail");
+	if (mailList) {
+		if (!(strcmp("mail", NoRemove->attribute) == 0 && g_list_length(mailList) == 1)) {
+			mail = g_malloc(sizeof(*mail));
+			char **tmp = g_malloc(sizeof(*tmp));
+			mail = tmp;
+			while (mailList) {
+				EmailKeyValue *item = mailList->data;
+				*tmp++ = g_strdup((gchar *) item->mail);
+				mailList = g_list_next(mailList);
+			}
+			*tmp = NULL;
+			SETMODS(mods[cnt], modarr[cnt], LDAP_MOD_REPLACE, "mail", mail);
+			cnt++;
+		}
+	}
+	param = g_hash_table_lookup(contact , "sn");
+	if (param && (strcmp(param, NoRemove->value) != 0 && strcmp("sn", NoRemove->attribute) != 0)) {
+		SETMOD(mods[cnt], modarr[cnt], LDAP_MOD_REPLACE, "sn", sn, param);
+		cnt++;
+	}
+	debug_print("newDN: %s\n", dn);
+	if (NoRemove)
+		g_free(NoRemove);
+	server->retVal = LDAPRC_SUCCESS;
+	if (cnt > 0) {
+		mods[cnt] = NULL;
+		int rc = ldap_modify_ext_s(ld, dn, mods, NULL, NULL);
+		if (rc) {
+			fprintf(stderr, "ldap_modify for dn=%s\" failed[0x%x]: %s\n",
+                    dn, rc, ldap_err2string(rc));
+			server->retVal = LDAPRC_NAMING_VIOLATION;
+		}
+		if (mail)
+			g_free(mail);
+	}
+	clean_up(ld, server, contact);
+}
+
+/**
+ * Delete contact from LDAP
+ *
+ * \param server AddressBook resource
+ * \param contact GHashTable with object to delete
+ */
+void ldapsvr_delete_contact(LdapServer *server, GHashTable *contact) {
+	LDAP *ld = NULL;
+	gchar *dn;
+
+	g_return_if_fail(server != NULL || contact != NULL);
+	ld = ldapsvr_connect(server->control);
+	if (ld == NULL) {
+		clean_up(ld, server, contact);
+		return;
+	}
+	dn = g_hash_table_lookup(contact, "dn");
+	if (dn == NULL) {
+		clean_up(ld, server, contact);
+		return;
+	}
+	int rc = ldap_delete_ext_s(ld, dn, NULL, NULL);
+	if (rc) {
+		fprintf(stderr, "ldap_modify for dn=%s\" failed[0x%x]: %s\n",
+				dn, rc, ldap_err2string(rc));
+		server->retVal = LDAPRC_NODN;
+	}
+	clean_up(ld, server, contact);
+}
+
+/**
+ * Update any changes to the server.
+ *
+ * \param server AddressBook resource.
+ * \param person ItemPerson holding user input.
+ */
+void ldapsvr_update_book(LdapServer *server, ItemPerson *item) {
+	GList *node = NULL;
+	GHashTable *contact = NULL;
+	GList *contacts = NULL, *head = NULL;
+
+	g_return_if_fail(server != NULL);
+
+	debug_set_mode(FALSE);
+	contact = g_hash_table_new(g_str_hash, g_str_equal);
+	if (item) {
+		gboolean result = ldapsvr_retrieve_item_person(item, contact);
+		debug_print("Found contact to update: %s\n", result? "Yes" : "No");
+		if (result) {
+			if (debug_get_mode()) {
+				addritem_print_item_person(item, stdout);
+			}
+			contacts = g_list_append(contacts, contact);
+		}
+	}
+	else {
+		ItemFolder *folder = server->addressCache->rootFolder;
+		node = folder->listFolder;
+		if (node) {
+			while (node) {
+				AddrItemObject *aio = node->data;
+				if (aio) {
+					if (aio->type == ITEMTYPE_FOLDER) {
+						ItemFolder *folder = (ItemFolder *) aio;
+						GList *persons = folder->listPerson;
+						while (persons) {
+							AddrItemObject *aio = persons->data;
+							if (aio) {
+								if (aio->type == ITEMTYPE_PERSON) {
+									ItemPerson *item = (ItemPerson *) aio;
+									gboolean result = ldapsvr_retrieve_item_person(item, contact);
+									debug_print("Found contact to update: %s\n", result? "Yes" : "No");
+									if (result) {
+										if (debug_get_mode()) {
+											gchar *uid = g_hash_table_lookup(contact, "uid");
+											item = ldapsvr_get_contact(server, uid);
+											addritem_print_item_person(item, stdout);
+										}
+										contacts = g_list_append(contacts, contact);
+									}
+								}
+							}
+							persons = g_list_next(persons);
+						}
+					}
+				}
+				else {
+					fprintf(stderr, "\t\tpid : ???\n");
+				}
+				node = g_list_next(node);
+			}
+		}
+	}
+	head = contacts;
+	if (debug_get_mode()) {
+		if (contacts)
+			debug_print("Contacts which must be updated in LDAP:\n");
+		while (contacts) {
+			debug_print("\tContact:\n");
+			g_hash_table_foreach(contacts->data, 
+				ldapsvr_print_contacts_hashtable, stderr);
+			contacts = g_list_next(contacts);
+		}
+	}
+	if (contacts == NULL)
+		contacts = head;
+	while (contacts) {
+		contact = (GHashTable *) contacts->data;
+		gchar *status = (gchar *) g_hash_table_lookup(contact, "status");
+		if (status == NULL)
+			status = g_strdup("NULL");
+		if (g_ascii_strcasecmp(status, "new") == 0) {
+			ldapsvr_add_contact(server, contact);
+		}
+		else if (g_ascii_strcasecmp(status, "update") == 0) {
+			ldapsvr_update_contact(server, contact);
+		}
+		else if (g_ascii_strcasecmp(status, "delete") == 0) {
+			ldapsvr_delete_contact(server, contact);
+		}
+		else
+			g_critical("ldapsvr_update_book->Unknown status: %s\n", status);
+		contacts = g_list_next(contacts);
+	}
+	ldapsvr_free_hashtable(head);
+	debug_set_mode(FALSE);
+}
+
+#endif	/* USE_LDAP */
+
+/*
+ * End of Source.
+ */
+
diff -Naur claws-mail-2.8.1-orig/src/ldapupdate.h claws-mail-2.8.1-ldap/src/ldapupdate.h
--- claws-mail-2.8.1-orig/src/ldapupdate.h	1970-01-01 01:00:00.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/ldapupdate.h	2007-04-03 13:33:03.000000000 +0200
@@ -0,0 +1,39 @@
+/*
+ * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2003-2007 Michael Rasmussen and the Claws Mail team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/*
+ * Definitions necessary to update LDAP servers.
+ */
+
+#ifndef __LDAPUPDATE_H__
+#define __LDAPUPDATE_H__
+
+#ifdef USE_LDAP
+
+#include <glib.h>
+
+#include "ldapserver.h"
+
+/* Function proto types */
+void ldapsvr_update_book(LdapServer *server, ItemPerson *item);
+
+#endif	/* USE_LDAP */
+
+#endif /* __LDAPUPDATE_H__ */
+
diff -Naur claws-mail-2.8.1-orig/src/Makefile.am claws-mail-2.8.1-ldap/src/Makefile.am
--- claws-mail-2.8.1-orig/src/Makefile.am	2007-03-06 05:44:47.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/Makefile.am	2007-03-28 20:08:50.000000000 +0200
@@ -73,6 +73,7 @@
 	ldaplocate.c \
 	ldapquery.c \
 	ldapserver.c \
+	ldapupdate.c \
 	ldaputil.c \
 	ldif.c \
 	localfolder.c \
@@ -213,6 +214,7 @@
 	ldaplocate.h \
 	ldapquery.h \
 	ldapserver.h \
+	ldapupdate.h \
 	ldaputil.h \
 	ldif.h \
 	localfolder.h \
@@ -315,7 +317,7 @@
 	pixmaps/deleted.xpm \
 	pixmaps/dir_close.xpm \
 	pixmaps/dir_noselect.xpm \
-        pixmaps/dir_open_hrm.xpm \
+    pixmaps/dir_open_hrm.xpm \
 	pixmaps/dir_open.xpm \
 	pixmaps/down_arrow.xpm \
 	pixmaps/drafts_close.xpm \
diff -Naur claws-mail-2.8.1-orig/src/plugins/bogofilter/Makefile.in claws-mail-2.8.1-ldap/src/plugins/bogofilter/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/bogofilter/Makefile.in	2007-03-06 05:56:45.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/bogofilter/Makefile.in	2007-03-28 20:11:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -61,21 +69,17 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_bogofilter_la_OBJECTS = bogofilter.lo bogofilter_gtk.lo
 bogofilter_la_OBJECTS = $(am_bogofilter_la_OBJECTS)
-bogofilter_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(bogofilter_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(bogofilter_la_SOURCES)
 DIST_SOURCES = $(bogofilter_la_SOURCES)
 ETAGS = etags
@@ -83,6 +87,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -94,11 +100,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -108,6 +142,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -139,7 +175,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -169,11 +204,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -181,6 +217,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -190,6 +228,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -206,14 +246,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -225,7 +265,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -256,15 +295,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = bogofilter.la
 bogofilter_la_SOURCES = \
@@ -304,9 +340,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 \
@@ -326,7 +362,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -337,7 +373,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -352,7 +388,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 bogofilter.la: $(bogofilter_la_OBJECTS) $(bogofilter_la_DEPENDENCIES) 
-	$(bogofilter_la_LINK) -rpath $(plugindir) $(bogofilter_la_OBJECTS) $(bogofilter_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(bogofilter_la_LDFLAGS) $(bogofilter_la_OBJECTS) $(bogofilter_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -364,22 +400,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bogofilter_gtk.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -390,6 +426,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -439,21 +479,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -469,7 +510,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -504,7 +545,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -518,20 +559,12 @@
 
 install-data-am: install-pluginLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -552,23 +585,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pluginLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/clamav/Makefile.in claws-mail-2.8.1-ldap/src/plugins/clamav/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/clamav/Makefile.in	2007-03-06 05:56:45.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/clamav/Makefile.in	2007-03-28 20:11:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -61,21 +69,17 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_clamav_plugin_la_OBJECTS = clamav_plugin.lo clamav_plugin_gtk.lo
 clamav_plugin_la_OBJECTS = $(am_clamav_plugin_la_OBJECTS)
-clamav_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(clamav_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(clamav_plugin_la_SOURCES)
 DIST_SOURCES = $(clamav_plugin_la_SOURCES)
 ETAGS = etags
@@ -83,6 +87,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -94,11 +100,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -108,6 +142,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -139,7 +175,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -169,11 +204,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -181,6 +217,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -190,6 +228,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -206,14 +246,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -225,7 +265,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -256,15 +295,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = clamav_plugin.la
 clamav_plugin_la_SOURCES = \
@@ -306,9 +342,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/plugins/clamav/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/plugins/clamav/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/plugins/clamav/Makefile
+	  $(AUTOMAKE) --gnu  src/plugins/clamav/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -328,7 +364,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -339,7 +375,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -354,7 +390,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 clamav_plugin.la: $(clamav_plugin_la_OBJECTS) $(clamav_plugin_la_DEPENDENCIES) 
-	$(clamav_plugin_la_LINK) -rpath $(plugindir) $(clamav_plugin_la_OBJECTS) $(clamav_plugin_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(clamav_plugin_la_LDFLAGS) $(clamav_plugin_la_OBJECTS) $(clamav_plugin_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -366,22 +402,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clamav_plugin_gtk.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -392,6 +428,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -441,21 +481,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -471,7 +512,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -506,7 +547,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -520,20 +561,12 @@
 
 install-data-am: install-pluginLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -554,23 +587,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pluginLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/demo/Makefile.in claws-mail-2.8.1-ldap/src/plugins/demo/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/demo/Makefile.in	2007-03-06 05:56:45.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/demo/Makefile.in	2007-03-28 20:11:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -60,21 +68,17 @@
 demo_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_demo_la_OBJECTS = demo.lo
 demo_la_OBJECTS = $(am_demo_la_OBJECTS)
-demo_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(demo_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(demo_la_SOURCES)
 DIST_SOURCES = $(demo_la_SOURCES)
 ETAGS = etags
@@ -82,6 +86,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -93,11 +99,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -107,6 +141,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -138,7 +174,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -168,11 +203,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -180,6 +216,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -189,6 +227,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -205,14 +245,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -224,7 +264,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -255,15 +294,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = demo.la
 demo_la_SOURCES = \
@@ -297,9 +333,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 \
@@ -319,7 +355,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -330,7 +366,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -345,7 +381,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 demo.la: $(demo_la_OBJECTS) $(demo_la_DEPENDENCIES) 
-	$(demo_la_LINK) -rpath $(plugindir) $(demo_la_OBJECTS) $(demo_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(demo_la_LDFLAGS) $(demo_la_OBJECTS) $(demo_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -356,22 +392,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -382,6 +418,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -431,21 +471,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -461,7 +502,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -496,7 +537,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -510,20 +551,12 @@
 
 install-data-am: install-pluginLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -544,23 +577,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pluginLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/dillo_viewer/Makefile.in claws-mail-2.8.1-ldap/src/plugins/dillo_viewer/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/dillo_viewer/Makefile.in	2007-03-06 05:56:45.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/dillo_viewer/Makefile.in	2007-03-28 20:11:13.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -61,21 +69,17 @@
 	$(am__DEPENDENCIES_1)
 am_dillo_viewer_la_OBJECTS = dillo_viewer.lo dillo_prefs.lo
 dillo_viewer_la_OBJECTS = $(am_dillo_viewer_la_OBJECTS)
-dillo_viewer_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(dillo_viewer_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(dillo_viewer_la_SOURCES)
 DIST_SOURCES = $(dillo_viewer_la_SOURCES)
 ETAGS = etags
@@ -83,6 +87,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -94,11 +100,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -108,6 +142,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -139,7 +175,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -169,11 +204,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -181,6 +217,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -190,6 +228,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -206,14 +246,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -225,7 +265,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -256,15 +295,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = dillo_viewer.la
 dillo_viewer_la_SOURCES = \
@@ -303,9 +339,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 \
@@ -325,7 +361,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -336,7 +372,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -351,7 +387,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 dillo_viewer.la: $(dillo_viewer_la_OBJECTS) $(dillo_viewer_la_DEPENDENCIES) 
-	$(dillo_viewer_la_LINK) -rpath $(plugindir) $(dillo_viewer_la_OBJECTS) $(dillo_viewer_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(dillo_viewer_la_LDFLAGS) $(dillo_viewer_la_OBJECTS) $(dillo_viewer_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -363,22 +399,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillo_viewer.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -389,6 +425,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -438,21 +478,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -468,7 +509,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -503,7 +544,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -517,20 +558,12 @@
 
 install-data-am: install-pluginLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -551,23 +584,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pluginLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/Makefile.in claws-mail-2.8.1-ldap/src/plugins/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/Makefile.in	2007-03-06 05:56:45.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/Makefile.in	2007-03-28 20:11:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,11 +13,15 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -37,10 +41,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -50,13 +58,10 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = demo spamassassin bogofilter dillo_viewer trayicon \
@@ -64,6 +69,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -75,11 +82,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -89,6 +124,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -120,7 +157,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -150,11 +186,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -162,6 +199,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -171,6 +210,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -187,14 +228,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -206,7 +247,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -237,15 +277,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 @BUILD_DEMO_PLUGIN_TRUE@demo_dir = demo
 @BUILD_SPAMASSASSIN_PLUGIN_TRUE@spamassasssin_dir = spamassassin
 @BUILD_BOGOFILTER_PLUGIN_TRUE@bogofilter_dir = bogofilter
@@ -277,9 +314,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 \
@@ -304,6 +341,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -335,7 +376,8 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -436,21 +478,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -464,7 +507,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -472,8 +515,6 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -513,7 +554,8 @@
 
 distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
 
 dvi: dvi-recursive
 
@@ -527,20 +569,12 @@
 
 install-data-am:
 
-install-dvi: install-dvi-recursive
-
 install-exec-am:
 
-install-html: install-html-recursive
-
 install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -559,24 +593,22 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-info-am
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-recursive ctags \
+	ctags-recursive distclean distclean-generic distclean-libtool \
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+	maintainer-clean-generic maintainer-clean-recursive \
+	mostlyclean mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/pgpcore/Makefile.in claws-mail-2.8.1-ldap/src/plugins/pgpcore/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/pgpcore/Makefile.in	2007-03-06 05:56:45.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/pgpcore/Makefile.in	2007-03-28 20:11:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
 @SET_MAKE@
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -40,10 +44,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -64,21 +72,17 @@
 am_pgpcore_la_OBJECTS = passphrase.lo plugin.lo prefs_gpg.lo \
 	select-keys.lo sgpgme.lo pgp_viewer.lo
 pgpcore_la_OBJECTS = $(am_pgpcore_la_OBJECTS)
-pgpcore_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(pgpcore_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(pgpcore_la_SOURCES)
 DIST_SOURCES = $(pgpcore_la_SOURCES)
 pluginincludeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -88,6 +92,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -99,11 +105,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -113,6 +147,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -144,7 +180,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -174,11 +209,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -186,6 +222,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -195,6 +233,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -211,14 +251,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -230,7 +270,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -261,15 +300,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 EXTRA_DIST = version.rc plugin.def claws.def
 @OS_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
 @OS_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@@ -340,9 +376,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 \
@@ -362,7 +398,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -373,7 +409,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -388,7 +424,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 pgpcore.la: $(pgpcore_la_OBJECTS) $(pgpcore_la_DEPENDENCIES) 
-	$(pgpcore_la_LINK) -rpath $(plugindir) $(pgpcore_la_OBJECTS) $(pgpcore_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(pgpcore_la_LDFLAGS) $(pgpcore_la_OBJECTS) $(pgpcore_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -404,22 +440,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgpgme.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -429,9 +465,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-pluginincludeHEADERS: $(plugininclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pluginincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pluginincludedir)"
+	test -z "$(pluginincludedir)" || $(mkdir_p) "$(DESTDIR)$(pluginincludedir)"
 	@list='$(plugininclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -496,21 +536,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -526,7 +567,7 @@
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pluginincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -561,7 +602,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -576,20 +617,12 @@
 install-data-am: install-pluginLTLIBRARIES \
 	install-pluginincludeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -610,26 +643,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES \
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES \
 	uninstall-pluginincludeHEADERS
 
-.MAKE: install-am install-strip
-
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-local clean-pluginLTLIBRARIES ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginLTLIBRARIES install-pluginincludeHEADERS \
-	install-ps install-ps-am install-strip installcheck \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-pluginLTLIBRARIES \
+	install-pluginincludeHEADERS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES \
-	uninstall-pluginincludeHEADERS
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-pluginLTLIBRARIES uninstall-pluginincludeHEADERS
 
 
 @OS_WIN32_TRUE@%.lo : %.rc
diff -Naur claws-mail-2.8.1-orig/src/plugins/pgpinline/Makefile.in claws-mail-2.8.1-ldap/src/plugins/pgpinline/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/pgpinline/Makefile.in	2007-03-06 05:56:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/pgpinline/Makefile.in	2007-03-28 20:11:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,11 +16,15 @@
 
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -41,10 +45,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -65,21 +73,17 @@
 am__DEPENDENCIES_3 =
 am_pgpinline_la_OBJECTS = plugin.lo pgpinline.lo
 pgpinline_la_OBJECTS = $(am_pgpinline_la_OBJECTS)
-pgpinline_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(pgpinline_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(pgpinline_la_SOURCES)
 DIST_SOURCES = $(pgpinline_la_SOURCES)
 pluginDATA_INSTALL = $(INSTALL_DATA)
@@ -91,6 +95,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -102,11 +108,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -116,6 +150,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -147,7 +183,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -177,11 +212,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -189,6 +225,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -198,6 +236,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -214,14 +254,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -233,7 +273,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -264,15 +303,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpinline.deps
 @OS_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
 @OS_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@@ -338,9 +374,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 \
@@ -360,7 +396,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -371,7 +407,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -386,7 +422,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 pgpinline.la: $(pgpinline_la_OBJECTS) $(pgpinline_la_DEPENDENCIES) 
-	$(pgpinline_la_LINK) -rpath $(plugindir) $(pgpinline_la_OBJECTS) $(pgpinline_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(pgpinline_la_LDFLAGS) $(pgpinline_la_OBJECTS) $(pgpinline_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -398,22 +434,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -423,9 +459,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -442,7 +482,7 @@
 	done
 install-pluginincludeHEADERS: $(plugininclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pluginincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pluginincludedir)"
+	test -z "$(pluginincludedir)" || $(mkdir_p) "$(DESTDIR)$(pluginincludedir)"
 	@list='$(plugininclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -507,21 +547,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -537,7 +578,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pluginincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -572,7 +613,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -587,20 +628,12 @@
 install-data-am: install-pluginDATA install-pluginLTLIBRARIES \
 	install-pluginincludeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -621,27 +654,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-pluginincludeHEADERS
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-pluginincludeHEADERS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-local clean-pluginLTLIBRARIES ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginDATA install-pluginLTLIBRARIES \
-	install-pluginincludeHEADERS install-ps install-ps-am \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-pluginDATA \
+	install-pluginLTLIBRARIES install-pluginincludeHEADERS \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-pluginincludeHEADERS
+	uninstall-info-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-pluginincludeHEADERS
 
 
 @OS_WIN32_TRUE@%.lo : %.rc
diff -Naur claws-mail-2.8.1-orig/src/plugins/pgpmime/Makefile.in claws-mail-2.8.1-ldap/src/plugins/pgpmime/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/pgpmime/Makefile.in	2007-03-06 05:56:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/pgpmime/Makefile.in	2007-03-28 20:11:15.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,11 +16,15 @@
 
 
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -41,10 +45,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -65,21 +73,17 @@
 am__DEPENDENCIES_3 =
 am_pgpmime_la_OBJECTS = plugin.lo pgpmime.lo
 pgpmime_la_OBJECTS = $(am_pgpmime_la_OBJECTS)
-pgpmime_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(pgpmime_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(pgpmime_la_SOURCES)
 DIST_SOURCES = $(pgpmime_la_SOURCES)
 pluginDATA_INSTALL = $(INSTALL_DATA)
@@ -91,6 +95,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -102,11 +108,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -116,6 +150,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -147,7 +183,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -177,11 +212,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -189,6 +225,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -198,6 +236,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -214,14 +254,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -233,7 +273,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -264,15 +303,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def pgpmime.deps
 @OS_WIN32_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
 @OS_WIN32_TRUE@     `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
@@ -337,9 +373,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 \
@@ -359,7 +395,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -370,7 +406,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -385,7 +421,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 pgpmime.la: $(pgpmime_la_OBJECTS) $(pgpmime_la_DEPENDENCIES) 
-	$(pgpmime_la_LINK) -rpath $(plugindir) $(pgpmime_la_OBJECTS) $(pgpmime_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(pgpmime_la_LDFLAGS) $(pgpmime_la_OBJECTS) $(pgpmime_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -397,22 +433,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -422,9 +458,13 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
 install-pluginDATA: $(plugin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -441,7 +481,7 @@
 	done
 install-pluginincludeHEADERS: $(plugininclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pluginincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pluginincludedir)"
+	test -z "$(pluginincludedir)" || $(mkdir_p) "$(DESTDIR)$(pluginincludedir)"
 	@list='$(plugininclude_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -506,21 +546,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -536,7 +577,7 @@
 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pluginincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -571,7 +612,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -586,20 +627,12 @@
 install-data-am: install-pluginDATA install-pluginLTLIBRARIES \
 	install-pluginincludeHEADERS
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -620,27 +653,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-pluginincludeHEADERS
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-pluginincludeHEADERS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-local clean-pluginLTLIBRARIES ctags \
 	distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-pluginDATA install-pluginLTLIBRARIES \
-	install-pluginincludeHEADERS install-ps install-ps-am \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-pluginDATA \
+	install-pluginLTLIBRARIES install-pluginincludeHEADERS \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
-	uninstall-pluginincludeHEADERS
+	uninstall-info-am uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-pluginincludeHEADERS
 
 
 @OS_WIN32_TRUE@%.lo : %.rc
diff -Naur claws-mail-2.8.1-orig/src/plugins/spamassassin/Makefile.in claws-mail-2.8.1-ldap/src/plugins/spamassassin/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/spamassassin/Makefile.in	2007-03-06 05:56:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/spamassassin/Makefile.in	2007-03-28 20:11:15.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -62,21 +70,17 @@
 am_spamassassin_la_OBJECTS = spamassassin.lo spamassassin_gtk.lo \
 	libspamc.lo utils.lo
 spamassassin_la_OBJECTS = $(am_spamassassin_la_OBJECTS)
-spamassassin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(spamassassin_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(spamassassin_la_SOURCES)
 DIST_SOURCES = $(spamassassin_la_SOURCES)
 ETAGS = etags
@@ -84,6 +88,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -95,11 +101,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -109,6 +143,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -140,7 +176,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -170,11 +205,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -182,6 +218,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -191,6 +229,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -207,14 +247,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -226,7 +266,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -257,15 +296,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = spamassassin.la
 spamassassin_la_SOURCES = \
@@ -310,9 +346,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 \
@@ -332,7 +368,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -343,7 +379,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -358,7 +394,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 spamassassin.la: $(spamassassin_la_OBJECTS) $(spamassassin_la_DEPENDENCIES) 
-	$(spamassassin_la_LINK) -rpath $(plugindir) $(spamassassin_la_OBJECTS) $(spamassassin_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(spamassassin_la_LDFLAGS) $(spamassassin_la_OBJECTS) $(spamassassin_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -372,22 +408,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -398,6 +434,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -447,21 +487,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -477,7 +518,7 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -512,7 +553,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -526,20 +567,12 @@
 
 install-data-am: install-pluginLTLIBRARIES
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -560,23 +593,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pluginLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/trayicon/libeggtrayicon/Makefile.in claws-mail-2.8.1-ldap/src/plugins/trayicon/libeggtrayicon/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/trayicon/libeggtrayicon/Makefile.in	2007-03-06 05:56:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/trayicon/libeggtrayicon/Makefile.in	2007-03-28 20:11:17.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -52,18 +60,17 @@
 libeggtrayicon_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_libeggtrayicon_la_OBJECTS = eggtrayicon.lo
 libeggtrayicon_la_OBJECTS = $(am_libeggtrayicon_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libeggtrayicon_la_SOURCES)
 DIST_SOURCES = $(libeggtrayicon_la_SOURCES)
 ETAGS = etags
@@ -71,6 +78,8 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -82,11 +91,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -96,6 +133,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -127,7 +166,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -157,11 +195,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -169,6 +208,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -178,6 +219,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -194,14 +237,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -213,7 +256,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -244,15 +286,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libeggtrayicon.la
 libeggtrayicon_la_SOURCES = \
 	eggtrayicon.c eggtrayicon.h
@@ -280,9 +319,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 \
@@ -310,7 +349,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 libeggtrayicon.la: $(libeggtrayicon_la_OBJECTS) $(libeggtrayicon_la_DEPENDENCIES) 
-	$(LINK)  $(libeggtrayicon_la_OBJECTS) $(libeggtrayicon_la_LIBADD) $(LIBS)
+	$(LINK)  $(libeggtrayicon_la_LDFLAGS) $(libeggtrayicon_la_OBJECTS) $(libeggtrayicon_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -321,22 +360,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggtrayicon.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -347,6 +386,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -396,21 +439,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -458,7 +502,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
@@ -472,20 +516,12 @@
 
 install-data-am:
 
-install-dvi: install-dvi-am
-
 install-exec-am:
 
-install-html: install-html-am
-
 install-info: install-info-am
 
 install-man:
 
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -506,22 +542,19 @@
 
 ps-am:
 
-uninstall-am:
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur claws-mail-2.8.1-orig/src/plugins/trayicon/Makefile.in claws-mail-2.8.1-ldap/src/plugins/trayicon/Makefile.in
--- claws-mail-2.8.1-orig/src/plugins/trayicon/Makefile.in	2007-03-06 05:56:46.000000000 +0100
+++ claws-mail-2.8.1-ldap/src/plugins/trayicon/Makefile.in	2007-03-28 20:11:16.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,11 +14,15 @@
 
 @SET_MAKE@
 
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +42,14 @@
 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 \
+	$(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/gnupg-check-typedef.m4 \
 	$(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
-	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -61,38 +69,33 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_trayicon_la_OBJECTS = trayicon.lo trayicon_prefs.lo
 trayicon_la_OBJECTS = $(am_trayicon_la_OBJECTS)
-trayicon_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(trayicon_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(trayicon_la_SOURCES)
 DIST_SOURCES = $(trayicon_la_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
+	install-exec-recursive install-info-recursive \
+	install-recursive installcheck-recursive installdirs-recursive \
+	pdf-recursive ps-recursive uninstall-info-recursive \
+	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AS = @AS@
@@ -104,11 +107,39 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BUILD_BOGOFILTER_PLUGIN_FALSE = @BUILD_BOGOFILTER_PLUGIN_FALSE@
+BUILD_BOGOFILTER_PLUGIN_TRUE = @BUILD_BOGOFILTER_PLUGIN_TRUE@
+BUILD_CLAMAV_PLUGIN_FALSE = @BUILD_CLAMAV_PLUGIN_FALSE@
+BUILD_CLAMAV_PLUGIN_TRUE = @BUILD_CLAMAV_PLUGIN_TRUE@
+BUILD_DEMO_PLUGIN_FALSE = @BUILD_DEMO_PLUGIN_FALSE@
+BUILD_DEMO_PLUGIN_TRUE = @BUILD_DEMO_PLUGIN_TRUE@
+BUILD_DILLO_VIEWER_PLUGIN_FALSE = @BUILD_DILLO_VIEWER_PLUGIN_FALSE@
+BUILD_DILLO_VIEWER_PLUGIN_TRUE = @BUILD_DILLO_VIEWER_PLUGIN_TRUE@
+BUILD_MANUAL_FALSE = @BUILD_MANUAL_FALSE@
+BUILD_MANUAL_TRUE = @BUILD_MANUAL_TRUE@
+BUILD_PGPCORE_PLUGIN_FALSE = @BUILD_PGPCORE_PLUGIN_FALSE@
+BUILD_PGPCORE_PLUGIN_TRUE = @BUILD_PGPCORE_PLUGIN_TRUE@
+BUILD_PGPINLINE_PLUGIN_FALSE = @BUILD_PGPINLINE_PLUGIN_FALSE@
+BUILD_PGPINLINE_PLUGIN_TRUE = @BUILD_PGPINLINE_PLUGIN_TRUE@
+BUILD_PGPMIME_PLUGIN_FALSE = @BUILD_PGPMIME_PLUGIN_FALSE@
+BUILD_PGPMIME_PLUGIN_TRUE = @BUILD_PGPMIME_PLUGIN_TRUE@
+BUILD_SPAMASSASSIN_PLUGIN_FALSE = @BUILD_SPAMASSASSIN_PLUGIN_FALSE@
+BUILD_SPAMASSASSIN_PLUGIN_TRUE = @BUILD_SPAMASSASSIN_PLUGIN_TRUE@
+BUILD_TRAYICON_PLUGIN_FALSE = @BUILD_TRAYICON_PLUGIN_FALSE@
+BUILD_TRAYICON_PLUGIN_TRUE = @BUILD_TRAYICON_PLUGIN_TRUE@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CLAMAV_CFLAGS = @CLAMAV_CFLAGS@
 CLAMAV_LIBS = @CLAMAV_LIBS@
+CLAWS_GNOME2_FALSE = @CLAWS_GNOME2_FALSE@
+CLAWS_GNOME2_TRUE = @CLAWS_GNOME2_TRUE@
+CLAWS_GNOMEPRINT_FALSE = @CLAWS_GNOMEPRINT_FALSE@
+CLAWS_GNOMEPRINT_TRUE = @CLAWS_GNOMEPRINT_TRUE@
+CLAWS_GNOME_FALSE = @CLAWS_GNOME_FALSE@
+CLAWS_GNOME_TRUE = @CLAWS_GNOME_TRUE@
+CLAWS_LIBETPAN_FALSE = @CLAWS_LIBETPAN_FALSE@
+CLAWS_LIBETPAN_TRUE = @CLAWS_LIBETPAN_TRUE@
 COMPFACE_LIBS = @COMPFACE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -118,6 +149,8 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+CYGWIN_FALSE = @CYGWIN_FALSE@
+CYGWIN_TRUE = @CYGWIN_TRUE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -149,7 +182,6 @@
 GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -179,11 +211,12 @@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAJOR_VERSION = @MAJOR_VERSION@
 MAKEINFO = @MAKEINFO@
 MICRO_VERSION = @MICRO_VERSION@
 MINOR_VERSION = @MINOR_VERSION@
-MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -191,6 +224,8 @@
 OBJEXT = @OBJEXT@
 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
 OPENSSL_LIBS = @OPENSSL_LIBS@
+OS_WIN32_FALSE = @OS_WIN32_FALSE@
+OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -200,6 +235,8 @@
 PASSCRYPT_KEY = @PASSCRYPT_KEY@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
@@ -216,14 +253,14 @@
 XGETTEXT_015 = @XGETTEXT_015@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_cv_enable_crash_dialog = @ac_cv_enable_crash_dialog@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -235,7 +272,6 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
-builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -266,15 +302,12 @@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
 SUBDIRS = libeggtrayicon
 plugindir = $(pkglibdir)/plugins
 plugin_LTLIBRARIES = trayicon.la
@@ -331,9 +364,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 \
@@ -353,7 +386,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
 	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    f=$(am__strip_dir) \
@@ -364,7 +397,7 @@
 
 uninstall-pluginLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	@set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 	  p=$(am__strip_dir) \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
@@ -379,7 +412,7 @@
 	  rm -f "$${dir}/so_locations"; \
 	done
 trayicon.la: $(trayicon_la_OBJECTS) $(trayicon_la_DEPENDENCIES) 
-	$(trayicon_la_LINK) -rpath $(plugindir) $(trayicon_la_OBJECTS) $(trayicon_la_LIBADD) $(LIBS)
+	$(LINK) -rpath $(plugindir) $(trayicon_la_LDFLAGS) $(trayicon_la_OBJECTS) $(trayicon_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -391,22 +424,22 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trayicon_prefs.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -417,6 +450,10 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
 # To change the values of `make' variables: instead of editing Makefiles,
@@ -448,7 +485,8 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -549,21 +587,22 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -577,7 +616,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || $(mkdir_p) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -585,8 +624,6 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -597,7 +634,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(plugindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -632,7 +669,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
@@ -646,20 +683,12 @@
 
 install-data-am: install-pluginLTLIBRARIES
 
-install-dvi: install-dvi-recursive
-
 install-exec-am:
 
-install-html: install-html-recursive
-
 install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -680,26 +709,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-pluginLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-pluginLTLIBRARIES
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	clean-pluginLTLIBRARIES ctags ctags-recursive distclean \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+	clean clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	clean-recursive ctags ctags-recursive distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pluginLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-pluginLTLIBRARIES
+	distclean-recursive distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-pluginLTLIBRARIES \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am uninstall-pluginLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.